diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3cfee9dcf..3384e1dad 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@
 - Added CTM integration for Disk Manipulator (raoulvdberge)
 - Fixed possible rare dupe bug with Importer (raoulvdberge)
 - Fixed Shulker Box dupe bug with Destructor (raoulvdberge)
+- Fixed Grid crash with search history (raoulvdberge)
 
 ### 1.5.14
 - Updated Forge to 2426 (raoulvdberge)
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/gui/grid/GuiGrid.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/grid/GuiGrid.java
index 98472c238..f6708aa52 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/gui/grid/GuiGrid.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/grid/GuiGrid.java
@@ -14,11 +14,7 @@ import com.raoulvdberge.refinedstorage.container.ContainerGrid;
 import com.raoulvdberge.refinedstorage.gui.GuiBase;
 import com.raoulvdberge.refinedstorage.gui.Scrollbar;
 import com.raoulvdberge.refinedstorage.gui.grid.filtering.GridFilterParser;
-import com.raoulvdberge.refinedstorage.gui.grid.sorting.GridSorting;
-import com.raoulvdberge.refinedstorage.gui.grid.sorting.GridSortingID;
-import com.raoulvdberge.refinedstorage.gui.grid.sorting.GridSortingInventoryTweaks;
-import com.raoulvdberge.refinedstorage.gui.grid.sorting.GridSortingName;
-import com.raoulvdberge.refinedstorage.gui.grid.sorting.GridSortingQuantity;
+import com.raoulvdberge.refinedstorage.gui.grid.sorting.*;
 import com.raoulvdberge.refinedstorage.gui.grid.stack.GridStackFluid;
 import com.raoulvdberge.refinedstorage.gui.grid.stack.GridStackItem;
 import com.raoulvdberge.refinedstorage.gui.grid.stack.IGridStack;
@@ -651,6 +647,10 @@ public class GuiGrid extends GuiBase implements IGridDisplay {
     }
 
     private void updateSearchHistory(int delta) {
+        if (SEARCH_HISTORY.isEmpty()) {
+            return;
+        }
+
         if (searchHistory == -1) {
             searchHistory = SEARCH_HISTORY.size();
         }