diff --git a/Core/src/org/sleuthkit/autopsy/communications/MessageBrowser.java b/Core/src/org/sleuthkit/autopsy/communications/MessageBrowser.java
index da3416f003..68309f5195 100644
--- a/Core/src/org/sleuthkit/autopsy/communications/MessageBrowser.java
+++ b/Core/src/org/sleuthkit/autopsy/communications/MessageBrowser.java
@@ -118,10 +118,6 @@ public final class MessageBrowser extends JPanel implements ExplorerManager.Prov
                 Bundle.MessageBrowser_DataResultViewerTable_title()));
         messagesResultPanel.open();
 
-        //add listener that maintains correct selection in the Global Actions Context
-        KeyboardFocusManager.getCurrentKeyboardFocusManager()
-                .addPropertyChangeListener("focusOwner", focusPropertyListener);
-
         this.tableEM.addPropertyChangeListener(new PropertyChangeListener() {
             /**
              * Listener that pushes selections in the tableEM (the Accounts
@@ -176,6 +172,14 @@ public final class MessageBrowser extends JPanel implements ExplorerManager.Prov
         return proxyLookup;
     }
 
+    @Override
+    public void addNotify() {
+        super.addNotify();
+        //add listener that maintains correct selection in the Global Actions Context
+        KeyboardFocusManager.getCurrentKeyboardFocusManager()
+                .addPropertyChangeListener("focusOwner", focusPropertyListener);
+    }
+
     @Override
     public void removeNotify() {
         super.removeNotify();
diff --git a/Core/src/org/sleuthkit/autopsy/timeline/TimeLineTopComponent.java b/Core/src/org/sleuthkit/autopsy/timeline/TimeLineTopComponent.java
index 65db353507..3d19bd4226 100644
--- a/Core/src/org/sleuthkit/autopsy/timeline/TimeLineTopComponent.java
+++ b/Core/src/org/sleuthkit/autopsy/timeline/TimeLineTopComponent.java
@@ -446,6 +446,17 @@ public final class TimeLineTopComponent extends TopComponent implements Explorer
     public void componentOpened() {
         super.componentOpened();
         WindowManager.getDefault().setTopComponentFloating(this, true);
+
+        //add listener that maintains correct selection in the Global Actions Context
+        KeyboardFocusManager.getCurrentKeyboardFocusManager()
+                .addPropertyChangeListener("focusOwner", focusPropertyListener);
+    }
+
+    @Override
+    protected void componentClosed() {
+        super.componentClosed();
+        KeyboardFocusManager.getCurrentKeyboardFocusManager()
+                .removePropertyChangeListener("focusOwner", focusPropertyListener);
     }
 
     @Override
@@ -476,6 +487,7 @@ public final class TimeLineTopComponent extends TopComponent implements Explorer
                     .withZone(TimeLineController.getJodaTimeZone())
                     .toString(zonedFormatter);
             return Bundle.TimeLineResultView_startDateToEndDate_text(start, end);
+
         }
     }