diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/DataContentPanel.java b/Core/src/org/sleuthkit/autopsy/corecomponents/DataContentPanel.java
index ae49ab720a..8e8183e2f1 100644
--- a/Core/src/org/sleuthkit/autopsy/corecomponents/DataContentPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/corecomponents/DataContentPanel.java
@@ -140,6 +140,8 @@ public class DataContentPanel extends javax.swing.JPanel implements DataContent,
             workerThread = null;
         }
         
+        currentNode = null;
+        
         // Reset everything
         for (int index = 0; index < jTabbedPane1.getTabCount(); index++) {
             jTabbedPane1.setEnabledAt(index, false);
@@ -299,7 +301,7 @@ public class DataContentPanel extends javax.swing.JPanel implements DataContent,
 
             try {
                 WorkerResults results = get();
-
+                currentNode = node;
                 if (results != null) {
                     updateTabs(results.getNode(), results.getSupportedIndices(), results.getPreferredViewerIndex());
                 }