diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/DataContentPanel.java b/Core/src/org/sleuthkit/autopsy/corecomponents/DataContentPanel.java
index 23601d5458..5137052009 100644
--- a/Core/src/org/sleuthkit/autopsy/corecomponents/DataContentPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/corecomponents/DataContentPanel.java
@@ -44,13 +44,19 @@ public class DataContentPanel extends javax.swing.JPanel implements DataContent,
         
         // add all implementors of DataContentViewer and put them in the tabbed pane
         Collection<? extends DataContentViewer> dcvs = Lookup.getDefault().lookupAll(DataContentViewer.class);
-        for (DataContentViewer factory : Lookup.getDefault().lookupAll(DataContentViewer.class)) {
+        for (DataContentViewer factory : dcvs) {
             DataContentViewer dcv = factory.getInstance();
             viewers.add(new UpdateWrapper(dcv));
             jTabbedPane1.addTab(dcv.getTitle(), null,
                     dcv.getComponent(), dcv.getToolTip());
         }
         
+        // disable the tabs
+        int numTabs = jTabbedPane1.getTabCount();
+        for (int tab = 0; tab < numTabs; ++tab) {
+            jTabbedPane1.setEnabledAt(tab, false);
+        }
+        
         jTabbedPane1.addChangeListener(this);
     }
     
diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/DataContentTopComponent.java b/Core/src/org/sleuthkit/autopsy/corecomponents/DataContentTopComponent.java
index ef26653e83..1b1d5a8f3b 100644
--- a/Core/src/org/sleuthkit/autopsy/corecomponents/DataContentTopComponent.java
+++ b/Core/src/org/sleuthkit/autopsy/corecomponents/DataContentTopComponent.java
@@ -46,7 +46,6 @@ public final class DataContentTopComponent extends TopComponent implements DataC
 
     // reference to the "default" TC that always stays open
     private static DataContentTopComponent defaultInstance;
-    private Node currentNode;
     // set to true if this is the TC that always stays open and is the default place to display content
     private boolean isDefault;