diff --git a/CHANGELOG.md b/CHANGELOG.md
index 12d8b25fb..e451dd014 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ### 1.5.17
 - Re-added support for OpenComputers (raoulvdberge)
+- Fixed crash with Grid (raoulvdberge)
 
 ### 1.5.16
 - Fixed crash when placing a Controller (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 c3a098ad1..bd11eb3ca 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/gui/grid/GuiGrid.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/grid/GuiGrid.java
@@ -618,6 +618,10 @@ public class GuiGrid extends GuiBase implements IGridDisplay {
             konami.pop();
         }
 
+        if (searchField == null) {
+            return;
+        }
+
         if (checkHotbarKeys(keyCode)) {
             // NO OP
         } else if (searchField.textboxKeyTyped(character, keyCode)) {