diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/DataContentTopComponent.form b/Core/src/org/sleuthkit/autopsy/corecomponents/DataContentTopComponent.form
index 1bad719e67..cef977f0c2 100644
--- a/Core/src/org/sleuthkit/autopsy/corecomponents/DataContentTopComponent.form
+++ b/Core/src/org/sleuthkit/autopsy/corecomponents/DataContentTopComponent.form
@@ -11,25 +11,10 @@
     <AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>
     <AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>
     <AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/>
+    <AuxValue name="designerSize" type="java.awt.Dimension" value="-84,-19,0,5,115,114,0,18,106,97,118,97,46,97,119,116,46,68,105,109,101,110,115,105,111,110,65,-114,-39,-41,-84,95,68,20,2,0,2,73,0,6,104,101,105,103,104,116,73,0,5,119,105,100,116,104,120,112,0,0,1,44,0,0,1,-112"/>
   </AuxValues>
 
-  <Layout>
-    <DimensionLayout dim="0">
-      <Group type="103" groupAlignment="0" attributes="0">
-          <Component id="dataContentPanel" alignment="0" pref="585" max="32767" attributes="0"/>
-      </Group>
-    </DimensionLayout>
-    <DimensionLayout dim="1">
-      <Group type="103" groupAlignment="0" attributes="0">
-          <Component id="dataContentPanel" alignment="0" pref="435" max="32767" attributes="0"/>
-      </Group>
-    </DimensionLayout>
+  <Layout class="org.netbeans.modules.form.compat2.layouts.DesignBoxLayout">
+    <Property name="axis" type="int" value="1"/>
   </Layout>
-  <SubComponents>
-    <Component class="org.sleuthkit.autopsy.corecomponents.DataContentPanel" name="dataContentPanel">
-      <AuxValues>
-        <AuxValue name="JavaCodeGenerator_CreateCodeCustom" type="java.lang.String" value="new DataContentPanel(true);"/>
-      </AuxValues>
-    </Component>
-  </SubComponents>
 </Form>
diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/DataContentTopComponent.java b/Core/src/org/sleuthkit/autopsy/corecomponents/DataContentTopComponent.java
index fde97d8b7a..4091980ab2 100644
--- a/Core/src/org/sleuthkit/autopsy/corecomponents/DataContentTopComponent.java
+++ b/Core/src/org/sleuthkit/autopsy/corecomponents/DataContentTopComponent.java
@@ -47,6 +47,8 @@ public final class DataContentTopComponent extends TopComponent implements DataC
     private static DataContentTopComponent defaultInstance;
     // set to true if this is the TC that always stays open and is the default place to display content
     private boolean isDefault;
+    // the content panel holding tabs with content viewers
+    private final DataContentPanel dataContentPanel;
 
     // contains a list of the undocked TCs
     private static ArrayList<DataContentTopComponent> newWindowList = new ArrayList<DataContentTopComponent>();
@@ -60,6 +62,10 @@ public final class DataContentTopComponent extends TopComponent implements DataC
         setToolTipText(TOOLTIP_TEXT);
 
         this.isDefault = isDefault;
+        
+        dataContentPanel = new DataContentPanel(isDefault);
+        add(dataContentPanel);
+        
         putClientProperty(TopComponent.PROP_CLOSING_DISABLED, Boolean.valueOf(isDefault)); // prevent option to close compoment in GUI
         logger.log(Level.INFO, "Created DataContentTopComponent instance: " + this);
     }
@@ -90,21 +96,9 @@ public final class DataContentTopComponent extends TopComponent implements DataC
     // <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
     private void initComponents() {
 
-        dataContentPanel = new DataContentPanel(true);
-
-        javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
-        this.setLayout(layout);
-        layout.setHorizontalGroup(
-            layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-            .addComponent(dataContentPanel, javax.swing.GroupLayout.DEFAULT_SIZE, 585, Short.MAX_VALUE)
-        );
-        layout.setVerticalGroup(
-            layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-            .addComponent(dataContentPanel, javax.swing.GroupLayout.DEFAULT_SIZE, 435, Short.MAX_VALUE)
-        );
+        setLayout(new javax.swing.BoxLayout(this, javax.swing.BoxLayout.Y_AXIS));
     }// </editor-fold>//GEN-END:initComponents
     // Variables declaration - do not modify//GEN-BEGIN:variables
-    private org.sleuthkit.autopsy.corecomponents.DataContentPanel dataContentPanel;
     // End of variables declaration//GEN-END:variables
 
     /**