diff --git a/src/main/java/refinedstorage/RefinedStorage.java b/src/main/java/refinedstorage/RefinedStorage.java
index 59116b570..d4afca352 100755
--- a/src/main/java/refinedstorage/RefinedStorage.java
+++ b/src/main/java/refinedstorage/RefinedStorage.java
@@ -34,11 +34,9 @@ public final class RefinedStorage {
     public final SimpleNetworkWrapper network = NetworkRegistry.INSTANCE.newSimpleChannel(ID);
 
     public final CreativeTabs tab = new CreativeTabs(ID) {
-        private ItemStack icon = new ItemStack(RefinedStorageItems.STORAGE_HOUSING);
-
         @Override
         public ItemStack getIconItemStack() {
-            return icon;
+            return new ItemStack(RefinedStorageItems.STORAGE_HOUSING);
         }
 
         @Override
diff --git a/src/main/java/refinedstorage/gui/GuiGrid.java b/src/main/java/refinedstorage/gui/GuiGrid.java
index 341e44e99..2c8c7de94 100755
--- a/src/main/java/refinedstorage/gui/GuiGrid.java
+++ b/src/main/java/refinedstorage/gui/GuiGrid.java
@@ -128,8 +128,12 @@ public class GuiGrid extends GuiBase {
 
                 if (grid.getViewType() == TileGrid.VIEW_TYPE_NON_CRAFTABLES && stack.isCraftable()) {
                     t.remove();
+
+                    continue;
                 } else if (grid.getViewType() == TileGrid.VIEW_TYPE_CRAFTABLES && !stack.isCraftable()) {
                     t.remove();
+
+                    continue;
                 }
 
                 if (query.startsWith("@")) {