diff --git a/Core/src/org/sleuthkit/autopsy/communications/FiltersPanel.form b/Core/src/org/sleuthkit/autopsy/communications/FiltersPanel.form
index c1b520127e..baa62440be 100644
--- a/Core/src/org/sleuthkit/autopsy/communications/FiltersPanel.form
+++ b/Core/src/org/sleuthkit/autopsy/communications/FiltersPanel.form
@@ -18,10 +18,11 @@
   <SubComponents>
     <Container class="javax.swing.JScrollPane" name="scrollPane">
       <Properties>
-        <Property name="autoscrolls" type="boolean" value="true"/>
         <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
           <Border info="null"/>
         </Property>
+        <Property name="horizontalScrollBarPolicy" type="int" value="31"/>
+        <Property name="autoscrolls" type="boolean" value="true"/>
       </Properties>
       <Constraints>
         <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
@@ -277,8 +278,14 @@
                 <Container class="javax.swing.JScrollPane" name="devicesScrollPane">
                   <Properties>
                     <Property name="horizontalScrollBarPolicy" type="int" value="31"/>
+                    <Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+                      <Dimension value="[32767, 30]"/>
+                    </Property>
                     <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
-                      <Dimension value="[27, 75]"/>
+                      <Dimension value="[27, 30]"/>
+                    </Property>
+                    <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+                      <Dimension value="[3, 30]"/>
                     </Property>
                   </Properties>
                   <Constraints>
@@ -379,8 +386,15 @@
                 </Component>
                 <Container class="javax.swing.JScrollPane" name="accountTypesScrollPane">
                   <Properties>
+                    <Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+                      <Dimension value="[32767, 210]"/>
+                    </Property>
+                    <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+                      <Dimension value="[20, 210]"/>
+                    </Property>
+                    <Property name="name" type="java.lang.String" value="" noResource="true"/>
                     <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
-                      <Dimension value="[2, 200]"/>
+                      <Dimension value="[2, 210]"/>
                     </Property>
                   </Properties>
                   <Constraints>
diff --git a/Core/src/org/sleuthkit/autopsy/communications/FiltersPanel.java b/Core/src/org/sleuthkit/autopsy/communications/FiltersPanel.java
index c346d0fe62..70f5de0a5e 100644
--- a/Core/src/org/sleuthkit/autopsy/communications/FiltersPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/communications/FiltersPanel.java
@@ -477,8 +477,9 @@ final public class FiltersPanel extends JPanel {
 
         setLayout(new java.awt.GridBagLayout());
 
-        scrollPane.setAutoscrolls(true);
         scrollPane.setBorder(null);
+        scrollPane.setHorizontalScrollBarPolicy(javax.swing.ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
+        scrollPane.setAutoscrolls(true);
 
         mainPanel.setLayout(new java.awt.GridBagLayout());
 
@@ -652,7 +653,9 @@ final public class FiltersPanel extends JPanel {
         devicesPane.add(checkAllDevicesButton, gridBagConstraints);
 
         devicesScrollPane.setHorizontalScrollBarPolicy(javax.swing.ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
-        devicesScrollPane.setMinimumSize(new java.awt.Dimension(27, 75));
+        devicesScrollPane.setMaximumSize(new java.awt.Dimension(32767, 30));
+        devicesScrollPane.setMinimumSize(new java.awt.Dimension(27, 30));
+        devicesScrollPane.setPreferredSize(new java.awt.Dimension(3, 30));
 
         devicesListPane.setMinimumSize(new java.awt.Dimension(4, 100));
         devicesListPane.setLayout(new javax.swing.BoxLayout(devicesListPane, javax.swing.BoxLayout.Y_AXIS));
@@ -728,7 +731,10 @@ final public class FiltersPanel extends JPanel {
         gridBagConstraints.insets = new java.awt.Insets(9, 0, 0, 0);
         accountTypesPane.add(checkAllAccountTypesButton, gridBagConstraints);
 
-        accountTypesScrollPane.setPreferredSize(new java.awt.Dimension(2, 200));
+        accountTypesScrollPane.setMaximumSize(new java.awt.Dimension(32767, 210));
+        accountTypesScrollPane.setMinimumSize(new java.awt.Dimension(20, 210));
+        accountTypesScrollPane.setName(""); // NOI18N
+        accountTypesScrollPane.setPreferredSize(new java.awt.Dimension(2, 210));
 
         accountTypeListPane.setLayout(new javax.swing.BoxLayout(accountTypeListPane, javax.swing.BoxLayout.PAGE_AXIS));
         accountTypesScrollPane.setViewportView(accountTypeListPane);