diff --git a/Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/AutoIngestRowSorter.java b/Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/AutoIngestRowSorter.java
index 7334e31229..31ecd5f4ca 100644
--- a/Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/AutoIngestRowSorter.java
+++ b/Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/AutoIngestRowSorter.java
@@ -37,9 +37,10 @@ class AutoIngestRowSorter<M extends DefaultTableModel> extends TableRowSorter<M>
 
     @Override
     public void toggleSortOrder(int column) {
-        if (!this.getModel().getColumnClass(column).equals(Date.class)) {
-            super.toggleSortOrder(column);  //if it isn't a date perform the regular sorting
-        } else {
+            if (!this.getModel().getColumnClass(column).equals(Date.class) && !this.getModel().getColumnClass(column).equals(Integer.class)) {
+                //currently the only Integer column this sorter is being applied to is the Priority column
+                super.toggleSortOrder(column);  //if it isn't a date or Integer column perform the regular sorting
+        } else {  
             ArrayList<RowSorter.SortKey> sortKeys = new ArrayList<>(getSortKeys());
             if (sortKeys.isEmpty() || sortKeys.get(0).getColumn() != column) {  //sort descending
                 sortKeys.add(0, new RowSorter.SortKey(column, SortOrder.DESCENDING));
diff --git a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/grouping/GroupManager.java b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/grouping/GroupManager.java
index ae9e17bb4a..8a934cda98 100755
--- a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/grouping/GroupManager.java
+++ b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/grouping/GroupManager.java
@@ -122,7 +122,7 @@ public class GroupManager {
     /*
      * --- current grouping/sorting attributes ---
      */
-    private volatile GroupSortBy sortBy = GroupSortBy.NONE;
+    private volatile GroupSortBy sortBy = GroupSortBy.PRIORITY;
     private volatile DrawableAttribute<?> groupBy = DrawableAttribute.PATH;
     private volatile SortOrder sortOrder = SortOrder.ASCENDING;
 
@@ -466,7 +466,7 @@ public class GroupManager {
         }
     }
 
-    public Comparator<DrawableGroup> getSortBy() {
+    public GroupSortBy getSortBy() {
         return sortBy;
     }
 
diff --git a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/Toolbar.java b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/Toolbar.java
index 2dc85cbfd9..90c739287e 100755
--- a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/Toolbar.java
+++ b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/Toolbar.java
@@ -189,7 +189,7 @@ public class Toolbar extends ToolBar {
         });
 
         sortChooser.sortOrderProperty().addListener(queryInvalidationListener);
-        sortChooser.setComparator(GroupSortBy.PRIORITY);
+        sortChooser.setComparator(controller.getGroupManager().getSortBy());
         getItems().add(1, sortChooser);
         sortHelpImageView.setCursor(Cursor.HAND);
 
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchGlobalSettingsPanel.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchGlobalSettingsPanel.java
index 93fa053dd4..8e820b4c74 100755
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchGlobalSettingsPanel.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchGlobalSettingsPanel.java
@@ -29,9 +29,9 @@ import org.sleuthkit.autopsy.ingest.IngestModuleGlobalSettingsPanel;
 final class KeywordSearchGlobalSettingsPanel extends IngestModuleGlobalSettingsPanel implements OptionsPanel {
 
     private static final long serialVersionUID = 1L;
-    private GlobalListSettingsPanel listsPanel;
-    private KeywordSearchGlobalLanguageSettingsPanel languagesPanel;
-    private KeywordSearchGlobalSearchSettingsPanel generalPanel;
+    private final GlobalListSettingsPanel listsPanel = new GlobalListSettingsPanel();
+    private final KeywordSearchGlobalLanguageSettingsPanel languagesPanel = new KeywordSearchGlobalLanguageSettingsPanel();
+    private final KeywordSearchGlobalSearchSettingsPanel generalPanel = new KeywordSearchGlobalSearchSettingsPanel();
 
     KeywordSearchGlobalSettingsPanel() {
         initComponents();
@@ -41,9 +41,6 @@ final class KeywordSearchGlobalSettingsPanel extends IngestModuleGlobalSettingsP
     @NbBundle.Messages({"KeywordSearchGlobalSettingsPanel.Title=Global Keyword Search Settings"})
     private void customizeComponents() {
         setName(Bundle.KeywordSearchGlobalSettingsPanel_Title());
-        listsPanel = new GlobalListSettingsPanel();
-        languagesPanel = new KeywordSearchGlobalLanguageSettingsPanel();
-        generalPanel = new KeywordSearchGlobalSearchSettingsPanel();
         tabbedPane.insertTab(NbBundle.getMessage(this.getClass(), "KeywordSearchConfigurationPanel.customizeComponents.listTabTitle"), null,
                 listsPanel, NbBundle.getMessage(this.getClass(), "KeywordSearchConfigurationPanel.customizeComponents.listLabToolTip"), 0);
         tabbedPane.insertTab(NbBundle.getMessage(this.getClass(), "KeywordSearchConfigurationPanel.customizeComponents.stringExtTitle"), null,