diff --git a/Core/src/org/sleuthkit/autopsy/core/layer.xml b/Core/src/org/sleuthkit/autopsy/core/layer.xml
index 4706ea1b1d..41788864d6 100644
--- a/Core/src/org/sleuthkit/autopsy/core/layer.xml
+++ b/Core/src/org/sleuthkit/autopsy/core/layer.xml
@@ -436,7 +436,7 @@
     <folder name="Windows2">
         <folder name="Components">
             <file name="DirectoryTreeTopComponent.settings" url="DirectoryTreeTopComponentSettings.xml"/>
-            <!-- <file name="DataContentTopComponent.settings" url="DataContentTopComponentSettings.xml" /> -->
+            <file name="DataContentTopComponent.settings" url="DataContentTopComponentSettings.xml" />
             <file name="IngestMessageTopComponent.settings" url="IngestMessageTopComponentSettings.xml"/>
         </folder>
         <folder name="Modes">
diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/DataContentTopComponent.java b/Core/src/org/sleuthkit/autopsy/corecomponents/DataContentTopComponent.java
index af015d0b4a..e7992d6a85 100644
--- a/Core/src/org/sleuthkit/autopsy/corecomponents/DataContentTopComponent.java
+++ b/Core/src/org/sleuthkit/autopsy/corecomponents/DataContentTopComponent.java
@@ -1,7 +1,7 @@
 /*
  * Autopsy Forensic Browser
  *
- * Copyright 2011-2018 Basis Technology Corp.
+ * Copyright 2011-2019 Basis Technology Corp.
  * Contact: carrier <at> sleuthkit <dot> org
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -40,9 +40,6 @@ import org.sleuthkit.autopsy.coreutils.Logger;
  * startup).
  */
 // Registered as a service provider in layer.xml
-//@TopComponent.Description(preferredID = "DataContentTopComponent")
-//@TopComponent.Registration(mode = "output", openAtStartup = true)
-//@TopComponent.OpenActionRegistration(displayName = "#CTL_DataContentAction", preferredID = "DataContentTopComponent")
 @SuppressWarnings("PMD.SingularField") // UI widgets cause lots of false positives
 public final class DataContentTopComponent extends TopComponent implements DataContent, ExplorerManager.Provider {
 
@@ -125,15 +122,18 @@ public final class DataContentTopComponent extends TopComponent implements DataC
     public static synchronized DataContentTopComponent findInstance() {
         TopComponent win = WindowManager.getDefault().findTopComponent(PREFERRED_ID);
         if (win == null) {
-            logger.warning("Cannot find " + PREFERRED_ID + " component. It will not be located properly in the window system."); //NON-NLS
+            logger.log(Level.INFO, "Cannot find " + PREFERRED_ID + " component. It will "
+                    + "not be located properly in the window system."); //NON-NLS
             return getDefault();
         }
+        
         if (win instanceof DataContentTopComponent) {
             return (DataContentTopComponent) win;
         }
-        logger.warning(
-                "There seem to be multiple components with the '" + PREFERRED_ID //NON-NLS
+        
+        logger.log(Level.INFO, "There seem to be multiple components with the '" + PREFERRED_ID //NON-NLS
                 + "' ID. That is a potential source of errors and unexpected behavior."); //NON-NLS
+        
         return getDefault();
     }