diff --git a/src/main/java/refinedstorage/gui/grid/GuiGrid.java b/src/main/java/refinedstorage/gui/grid/GuiGrid.java
index 3ca019d45..6f82c2c1d 100755
--- a/src/main/java/refinedstorage/gui/grid/GuiGrid.java
+++ b/src/main/java/refinedstorage/gui/grid/GuiGrid.java
@@ -1,6 +1,5 @@
 package refinedstorage.gui.grid;
 
-import net.minecraft.client.Minecraft;
 import net.minecraft.client.audio.PositionedSoundRecord;
 import net.minecraft.client.gui.GuiScreen;
 import net.minecraft.client.gui.GuiTextField;
@@ -40,6 +39,8 @@ public class GuiGrid extends GuiBase {
     public static List<ClientStack> ITEMS = new ArrayList<>();
     public static List<ClientStack> SORTED_ITEMS = new ArrayList<>();
 
+    public static boolean markedForSorting;
+
     private GuiTextField searchField;
 
     private ContainerGrid container;
@@ -90,32 +91,20 @@ public class GuiGrid extends GuiBase {
         return grid;
     }
 
-    public static void sortItems() {
-        GuiScreen screen = Minecraft.getMinecraft().currentScreen;
-
-        if (!(screen instanceof GuiGrid)) {
-            return;
-        }
-
-        GuiGrid gui = (GuiGrid) screen;
-
-        if (gui.searchField == null) {
-            return;
-        }
-
+    private void sortItems() {
         List<ClientStack> sortedItems = new ArrayList<>();
 
-        if (gui.getGrid().isConnected()) {
+        if (grid.isConnected()) {
             sortedItems.addAll(ITEMS);
 
-            String query = gui.searchField.getText().trim().toLowerCase();
+            String query = searchField.getText().trim().toLowerCase();
 
             Iterator<ClientStack> t = sortedItems.iterator();
 
             while (t.hasNext()) {
                 ClientStack stack = t.next();
 
-                List<GridFilteredItem> filteredItems = gui.getGrid().getFilteredItems();
+                List<GridFilteredItem> filteredItems = grid.getFilteredItems();
 
                 boolean found = filteredItems.isEmpty();
 
@@ -133,11 +122,11 @@ public class GuiGrid extends GuiBase {
                     continue;
                 }
 
-                if (gui.getGrid().getViewType() == TileGrid.VIEW_TYPE_NON_CRAFTABLES && stack.isCraftable()) {
+                if (grid.getViewType() == TileGrid.VIEW_TYPE_NON_CRAFTABLES && stack.isCraftable()) {
                     t.remove();
 
                     continue;
-                } else if (gui.getGrid().getViewType() == TileGrid.VIEW_TYPE_CRAFTABLES && !stack.isCraftable()) {
+                } else if (grid.getViewType() == TileGrid.VIEW_TYPE_CRAFTABLES && !stack.isCraftable()) {
                     t.remove();
 
                     continue;
@@ -171,24 +160,29 @@ public class GuiGrid extends GuiBase {
                 }
             }
 
-            SORTING_NAME.setSortingDirection(gui.getGrid().getSortingDirection());
-            SORTING_QUANTITY.setSortingDirection(gui.getGrid().getSortingDirection());
+            SORTING_NAME.setSortingDirection(grid.getSortingDirection());
+            SORTING_QUANTITY.setSortingDirection(grid.getSortingDirection());
 
             Collections.sort(sortedItems, SORTING_NAME);
 
-            if (gui.getGrid().getSortingType() == TileGrid.SORTING_TYPE_QUANTITY) {
+            if (grid.getSortingType() == TileGrid.SORTING_TYPE_QUANTITY) {
                 Collections.sort(sortedItems, SORTING_QUANTITY);
             }
         }
 
         SORTED_ITEMS = sortedItems;
 
-        gui.getScrollbar().setCanScroll(gui.getRows() > gui.getVisibleRows());
-        gui.getScrollbar().setScrollDelta((float) gui.getScrollbar().getScrollbarHeight() / (float) gui.getRows());
+        getScrollbar().setCanScroll(getRows() > getVisibleRows());
+        getScrollbar().setScrollDelta((float) getScrollbar().getScrollbarHeight() / (float) getRows());
     }
 
     @Override
     public void update(int x, int y) {
+        if (markedForSorting) {
+            markedForSorting = false;
+
+            sortItems();
+        }
     }
 
     private int getOffset() {
diff --git a/src/main/java/refinedstorage/network/MessageGridDelta.java b/src/main/java/refinedstorage/network/MessageGridDelta.java
index 662ffa33b..dbb765f82 100755
--- a/src/main/java/refinedstorage/network/MessageGridDelta.java
+++ b/src/main/java/refinedstorage/network/MessageGridDelta.java
@@ -47,14 +47,14 @@ public class MessageGridDelta implements IMessage, IMessageHandler<MessageGridDe
                     stack.getStack().stackSize += message.delta;
                 }
 
-                GuiGrid.sortItems();
+                GuiGrid.markedForSorting = true;
 
                 return null;
             }
         }
 
         GuiGrid.ITEMS.add(message.clientStack);
-        GuiGrid.sortItems();
+        GuiGrid.markedForSorting = true;
 
         return null;
     }
diff --git a/src/main/java/refinedstorage/network/MessageGridUpdate.java b/src/main/java/refinedstorage/network/MessageGridUpdate.java
index 8354bab53..669434656 100755
--- a/src/main/java/refinedstorage/network/MessageGridUpdate.java
+++ b/src/main/java/refinedstorage/network/MessageGridUpdate.java
@@ -44,7 +44,7 @@ public class MessageGridUpdate implements IMessage, IMessageHandler<MessageGridU
     @Override
     public IMessage onMessage(MessageGridUpdate message, MessageContext ctx) {
         GuiGrid.ITEMS = message.items;
-        GuiGrid.sortItems();
+        GuiGrid.markedForSorting = true;
 
         return null;
     }
diff --git a/src/main/java/refinedstorage/tile/grid/TileGrid.java b/src/main/java/refinedstorage/tile/grid/TileGrid.java
index 2e84a0509..b02b8bdf3 100755
--- a/src/main/java/refinedstorage/tile/grid/TileGrid.java
+++ b/src/main/java/refinedstorage/tile/grid/TileGrid.java
@@ -51,7 +51,8 @@ public class TileGrid extends TileNode implements IGrid {
                 tile.markDirty();
             }
         }
-    }, parameter -> GuiGrid.sortItems());
+    }, parameter ->
+        GuiGrid.markedForSorting = true);
 
     public static final TileDataParameter<Integer> SORTING_DIRECTION = new TileDataParameter<>(DataSerializers.VARINT, 0, new ITileDataProducer<Integer, TileGrid>() {
         @Override
@@ -67,7 +68,7 @@ public class TileGrid extends TileNode implements IGrid {
                 tile.markDirty();
             }
         }
-    }, parameter -> GuiGrid.sortItems());
+    }, parameter -> GuiGrid.markedForSorting = true);
 
     public static final TileDataParameter<Integer> SORTING_TYPE = new TileDataParameter<>(DataSerializers.VARINT, 0, new ITileDataProducer<Integer, TileGrid>() {
         @Override
@@ -83,7 +84,7 @@ public class TileGrid extends TileNode implements IGrid {
                 tile.markDirty();
             }
         }
-    }, parameter -> GuiGrid.sortItems());
+    }, parameter -> GuiGrid.markedForSorting = true);
 
     public static final TileDataParameter<Integer> SEARCH_BOX_MODE = new TileDataParameter<>(DataSerializers.VARINT, 0, new ITileDataProducer<Integer, TileGrid>() {
         @Override
diff --git a/src/main/java/refinedstorage/tile/grid/WirelessGrid.java b/src/main/java/refinedstorage/tile/grid/WirelessGrid.java
index b96be90ba..1e3303833 100755
--- a/src/main/java/refinedstorage/tile/grid/WirelessGrid.java
+++ b/src/main/java/refinedstorage/tile/grid/WirelessGrid.java
@@ -116,7 +116,7 @@ public class WirelessGrid implements IGrid {
 
         this.viewType = type;
 
-        GuiGrid.sortItems();
+        GuiGrid.markedForSorting = true;
     }
 
     @Override
@@ -125,7 +125,7 @@ public class WirelessGrid implements IGrid {
 
         this.sortingType = type;
 
-        GuiGrid.sortItems();
+        GuiGrid.markedForSorting = true;
     }
 
     @Override
@@ -134,7 +134,7 @@ public class WirelessGrid implements IGrid {
 
         this.sortingDirection = direction;
 
-        GuiGrid.sortItems();
+        GuiGrid.markedForSorting = true;
     }
 
     @Override