diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8e824c838..cb1b00d72 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
 - Storage Monitors don't render any quantity text when no item is specified to monitor anymore (raoulvdberge)
 - Fixed bug where disks in Disk Drive didn't respect access type or void excess stacks option (raoulvdberge)
 - Fixed crash in Disk Manipulator (raoulvdberge)
+- You can now shift click Grid Filters into a Grid instead of manually inserting them (raoulvdberge)
 - The Solderer inventory isn't sided anymore (raoulvdberge)
 
 ### 1.4.2
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerGrid.java b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerGrid.java
index cd5aad7fe..004ccda37 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerGrid.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerGrid.java
@@ -1,5 +1,6 @@
 package com.raoulvdberge.refinedstorage.container;
 
+import com.raoulvdberge.refinedstorage.RSItems;
 import com.raoulvdberge.refinedstorage.RSUtils;
 import com.raoulvdberge.refinedstorage.api.network.grid.IFluidGridHandler;
 import com.raoulvdberge.refinedstorage.api.network.grid.IItemGridHandler;
@@ -42,6 +43,12 @@ public class ContainerGrid extends ContainerBase {
         this.inventorySlots.clear();
         this.inventoryItemStacks.clear();
 
+        if (grid.getType() != GridType.FLUID) {
+            for (int i = 0; i < 4; ++i) {
+                addSlotToContainer(new SlotItemHandler(grid.getFilter(), i, 204, 6 + (18 * i) + getTabDelta()));
+            }
+        }
+
         int headerAndSlots = getTabDelta() + display.getHeader() + (display.getVisibleRows() * 18);
 
         addPlayerInventory(8, display.getYPlayerInventory());
@@ -82,12 +89,6 @@ public class ContainerGrid extends ContainerBase {
             addSlotToContainer(new SlotItemHandler(((NetworkNodeGrid) grid).getPatterns(), 0, 152, headerAndSlots + 4));
             addSlotToContainer(new SlotOutput(((NetworkNodeGrid) grid).getPatterns(), 1, 152, headerAndSlots + 40));
         }
-
-        if (grid.getType() != GridType.FLUID) {
-            for (int i = 0; i < 4; ++i) {
-                addSlotToContainer(new SlotItemHandler(grid.getFilter(), i, 204, 6 + (18 * i) + getTabDelta()));
-            }
-        }
     }
 
     private int getTabDelta() {
@@ -136,13 +137,34 @@ public class ContainerGrid extends ContainerBase {
                     sendCraftingSlots();
                     detectAndSendChanges();
                 } else if (slot != patternResultSlot && !(slot instanceof SlotFilterLegacy) && grid.getNetwork() != null) {
+                    ItemStack stack = slot.getStack();
+
+                    if (grid.getType() != GridType.FLUID && stack.getItem() == RSItems.FILTER) {
+                        int startIndex = 0;
+                        int endIndex = 4;
+
+                        // Move to player inventory instead
+                        if (slotIndex < 4) {
+                            startIndex = 4;
+                            endIndex = 4 + (9 * 4);
+                        }
+
+                        if (mergeItemStack(stack, startIndex, endIndex, false)) {
+                            slot.onSlotChanged();
+
+                            detectAndSendChanges();
+
+                            return ItemStack.EMPTY;
+                        }
+                    }
+
                     IItemGridHandler itemHandler = grid.getNetwork().getItemGridHandler();
                     IFluidGridHandler fluidHandler = grid.getNetwork().getFluidGridHandler();
 
                     if (grid.getType() != GridType.FLUID && itemHandler != null) {
-                        slot.putStack(RSUtils.transformNullToEmpty(itemHandler.onInsert((EntityPlayerMP) player, slot.getStack())));
+                        slot.putStack(RSUtils.transformNullToEmpty(itemHandler.onInsert((EntityPlayerMP) player, stack)));
                     } else if (grid.getType() == GridType.FLUID && fluidHandler != null) {
-                        slot.putStack(RSUtils.transformNullToEmpty(fluidHandler.onInsert((EntityPlayerMP) player, slot.getStack())));
+                        slot.putStack(RSUtils.transformNullToEmpty(fluidHandler.onInsert((EntityPlayerMP) player, stack)));
                     }
 
                     detectAndSendChanges();