diff --git a/Core/src/org/sleuthkit/autopsy/communications/FiltersPanel.java b/Core/src/org/sleuthkit/autopsy/communications/FiltersPanel.java
index 37f197f5fe..a9c6f58e4e 100644
--- a/Core/src/org/sleuthkit/autopsy/communications/FiltersPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/communications/FiltersPanel.java
@@ -129,9 +129,7 @@ final public class FiltersPanel extends JPanel {
     public FiltersPanel() {
         initComponents();
 
-        CheckBoxIconPanel panel = createAccoutTypeCheckBoxPanel(Account.Type.DEVICE, true);
-        accountTypeMap.put(Account.Type.DEVICE, panel.getCheckBox());
-        accountTypeListPane.add(panel);
+       initalizeDeviceAccountType();
 
         deviceRequiredLabel.setVisible(false);
         accountTypeRequiredLabel.setVisible(false);
@@ -259,12 +257,9 @@ final public class FiltersPanel extends JPanel {
             devicesListPane.removeAll();
             
             accountTypeMap.clear();           
-            accountTypeListPane.removeAll();
+            accountTypeListPane.removeAll(); 
             
-            CheckBoxIconPanel panel = createAccoutTypeCheckBoxPanel(Account.Type.DEVICE, true);
-            accountTypeMap.put(Account.Type.DEVICE, panel.getCheckBox());
-            accountTypeListPane.add(panel);
-                   
+            initalizeDeviceAccountType();
         });
     }
 
@@ -274,6 +269,12 @@ final public class FiltersPanel extends JPanel {
         IngestManager.getInstance().removeIngestModuleEventListener(ingestListener);
         IngestManager.getInstance().removeIngestJobEventListener(ingestJobListener);
     }
+    
+    private void initalizeDeviceAccountType() {
+        CheckBoxIconPanel panel = createAccoutTypeCheckBoxPanel(Account.Type.DEVICE, true);
+        accountTypeMap.put(Account.Type.DEVICE, panel.getCheckBox());
+        accountTypeListPane.add(panel);
+    }
 
     /**
      * Populate the Account Types filter widgets