diff --git a/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/PastCasesPanel.form b/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/PastCasesPanel.form
index b2b67acd4a..5138a0905c 100644
--- a/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/PastCasesPanel.form
+++ b/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/PastCasesPanel.form
@@ -96,9 +96,7 @@
                 <AuxValue name="JavaCodeGenerator_VariableModifier" type="java.lang.Integer" value="0"/>
               </AuxValues>
 
-              <Layout class="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout">
-                <Property name="useNullLayout" type="boolean" value="true"/>
-              </Layout>
+              <Layout class="org.netbeans.modules.form.compat2.layouts.DesignFlowLayout"/>
             </Container>
             <Component class="javax.swing.Box$Filler" name="filler2">
               <Properties>
@@ -165,9 +163,7 @@
                 <AuxValue name="JavaCodeGenerator_VariableModifier" type="java.lang.Integer" value="0"/>
               </AuxValues>
 
-              <Layout class="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout">
-                <Property name="useNullLayout" type="boolean" value="true"/>
-              </Layout>
+              <Layout class="org.netbeans.modules.form.compat2.layouts.DesignFlowLayout"/>
             </Container>
             <Component class="javax.swing.Box$Filler" name="filler5">
               <Properties>
diff --git a/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/PastCasesPanel.java b/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/PastCasesPanel.java
index 04de6df7de..576cdc6ea9 100644
--- a/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/PastCasesPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/PastCasesPanel.java
@@ -148,7 +148,6 @@ public class PastCasesPanel extends BaseDataSourceSummaryPanel {
         notableFilePanel.setMaximumSize(new java.awt.Dimension(32767, 106));
         notableFilePanel.setMinimumSize(new java.awt.Dimension(100, 106));
         notableFilePanel.setPreferredSize(new java.awt.Dimension(32767, 106));
-        notableFilePanel.setLayout(null);
         mainContentPanel.add(notableFilePanel);
         mainContentPanel.add(filler2);
 
@@ -159,7 +158,6 @@ public class PastCasesPanel extends BaseDataSourceSummaryPanel {
         sameIdPanel.setMaximumSize(new java.awt.Dimension(32767, 106));
         sameIdPanel.setMinimumSize(new java.awt.Dimension(100, 106));
         sameIdPanel.setPreferredSize(new java.awt.Dimension(32767, 106));
-        sameIdPanel.setLayout(null);
         mainContentPanel.add(sameIdPanel);
         mainContentPanel.add(filler5);