diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/DataResultPanel.java b/Core/src/org/sleuthkit/autopsy/corecomponents/DataResultPanel.java
index 3758e2278a..63d6992b76 100644
--- a/Core/src/org/sleuthkit/autopsy/corecomponents/DataResultPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/corecomponents/DataResultPanel.java
@@ -189,7 +189,12 @@ public class DataResultPanel extends javax.swing.JPanel implements DataResult, C
             // to better handle the ExplorerManager sharing implemented to support actions that operate on 
             // multiple selected nodes.
             addDataResultViewer(new DataResultViewerTable(this.explorerManager));
-            addDataResultViewer(new DataResultViewerThumbnail(this.explorerManager));
+            
+            // @@@ Temporary fix until unintended interaction between DataResultViewerTable and DataResultViewerThumbnail
+            // via the shared ExplorerManager in a Keyword Search Result window is resolved.
+            if (isMain) {
+                addDataResultViewer(new DataResultViewerThumbnail(this.explorerManager));
+            }
                                     
             // Find all DataResultViewer service providers and add them to the tabbed pane.
             for (DataResultViewer factory : Lookup.getDefault().lookupAll(DataResultViewer.class)) {
diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/DataResultViewerTable.java b/Core/src/org/sleuthkit/autopsy/corecomponents/DataResultViewerTable.java
index 36ccb8715d..1da346f00c 100644
--- a/Core/src/org/sleuthkit/autopsy/corecomponents/DataResultViewerTable.java
+++ b/Core/src/org/sleuthkit/autopsy/corecomponents/DataResultViewerTable.java
@@ -78,7 +78,6 @@ public class DataResultViewerTable extends AbstractDataResultViewer {
         ov.setAllowedDragActions(DnDConstants.ACTION_NONE);
         ov.setAllowedDropActions(DnDConstants.ACTION_NONE);
 
-        // only allow one item to be selected at a time
         ov.getOutline().setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
 
         // don't show the root node
diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/DataResultViewerThumbnail.java b/Core/src/org/sleuthkit/autopsy/corecomponents/DataResultViewerThumbnail.java
index 9c4fd31609..a9a70152df 100644
--- a/Core/src/org/sleuthkit/autopsy/corecomponents/DataResultViewerThumbnail.java
+++ b/Core/src/org/sleuthkit/autopsy/corecomponents/DataResultViewerThumbnail.java
@@ -85,7 +85,6 @@ public final class DataResultViewerThumbnail extends AbstractDataResultViewer {
     private void initialize() {
         initComponents();
 
-        // only allow one item to be selected at a time
         ((IconView) thumbnailScrollPanel).setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
 
         curPage = -1;