diff --git a/Core/src/org/sleuthkit/autopsy/filequery/FileSearchData.java b/Core/src/org/sleuthkit/autopsy/filequery/FileSearchData.java
index 4decdb12ad..e72c806015 100644
--- a/Core/src/org/sleuthkit/autopsy/filequery/FileSearchData.java
+++ b/Core/src/org/sleuthkit/autopsy/filequery/FileSearchData.java
@@ -205,7 +205,8 @@ class FileSearchData {
     }
 
     /**
-     * Enum representing the file type. We don't simply use
+     * Enum representing the file type.
+     * We don't simply use
      * FileTypeUtils.FileTypeCategory because: - Some file types categories
      * overlap - It is convenient to have the "OTHER" option for files that
      * don't match the given types
diff --git a/Core/src/org/sleuthkit/autopsy/filequery/ResultsPanel.form b/Core/src/org/sleuthkit/autopsy/filequery/ResultsPanel.form
index d3706721d5..6720771ade 100644
--- a/Core/src/org/sleuthkit/autopsy/filequery/ResultsPanel.form
+++ b/Core/src/org/sleuthkit/autopsy/filequery/ResultsPanel.form
@@ -101,15 +101,6 @@
             </Property>
             <Property name="enabled" type="boolean" value="false"/>
             <Property name="focusable" type="boolean" value="false"/>
-            <Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
-              <Dimension value="[23, 23]"/>
-            </Property>
-            <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
-              <Dimension value="[23, 23]"/>
-            </Property>
-            <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
-              <Dimension value="[23, 23]"/>
-            </Property>
             <Property name="rolloverIcon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
               <Image iconType="3" name="/org/sleuthkit/autopsy/corecomponents/btn_step_back_hover.png"/>
             </Property>
@@ -147,15 +138,6 @@
             </Property>
             <Property name="enabled" type="boolean" value="false"/>
             <Property name="focusable" type="boolean" value="false"/>
-            <Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
-              <Dimension value="[23, 23]"/>
-            </Property>
-            <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
-              <Dimension value="[23, 23]"/>
-            </Property>
-            <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
-              <Dimension value="[23, 23]"/>
-            </Property>
             <Property name="rolloverIcon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
               <Image iconType="3" name="/org/sleuthkit/autopsy/corecomponents/btn_step_forward_hover.png"/>
             </Property>
diff --git a/Core/src/org/sleuthkit/autopsy/filequery/ResultsPanel.java b/Core/src/org/sleuthkit/autopsy/filequery/ResultsPanel.java
index ddb1a231e7..4361a6dae1 100644
--- a/Core/src/org/sleuthkit/autopsy/filequery/ResultsPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/filequery/ResultsPanel.java
@@ -158,7 +158,9 @@ public class ResultsPanel extends javax.swing.JPanel {
     private void updateControls() {
         previousPageSize = (int) pageSizeSpinner.getValue();
         int pageSize = (int) pageSizeSpinner.getValue();
-        currentPageLabel.setText(Bundle.ResultsPanel_currentPage_displayValue(currentPage + 1, (groupSize / pageSize) + 1));
+        //handle edge case where group size is 0 and we want the empty results to be labeled paged 1 of 1 not page 1 of 0
+        double maxPageDouble = groupSize == 0 ? 0 : Math.ceil((double) groupSize / pageSize);
+        currentPageLabel.setText(Bundle.ResultsPanel_currentPage_displayValue(currentPage + 1, maxPageDouble));
         previousPageButton.setEnabled(currentPage != 0);
         nextPageButton.setEnabled(groupSize > ((currentPage + 1) * pageSize));
         gotoPageField.setEnabled(groupSize > pageSize);
@@ -358,9 +360,9 @@ public class ResultsPanel extends javax.swing.JPanel {
             return;
         }
         int pageSize = (int) pageSizeSpinner.getValue();
-        if ((newPage - 1) < 0 || groupSize < ((newPage - 1) * pageSize)) {
+        if ((newPage - 1) < 0 || groupSize <= ((newPage - 1) * pageSize)) {
             JOptionPane.showMessageDialog(this,
-                    Bundle.ResultsPanel_invalidPageNumber_message(newPage, ((groupSize / pageSize) + 1)),
+                    Bundle.ResultsPanel_invalidPageNumber_message(newPage, Math.ceil((double) groupSize / pageSize)),
                     Bundle.ResultsPanel_invalidPageNumber_title(),
                     JOptionPane.WARNING_MESSAGE);
             return;