diff --git a/CHANGELOG.md b/CHANGELOG.md
index ab9eb4a36..23f11a434 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@
 - Reworked Crafting Monitor GUI (raoulvdberge)
 - Fixed problems relating to Crafting Upgrade (scheduling a task wrongly, blocking other tasks, etc) (raoulvdberge)
 - Interface now supports Crafting Upgrade (raoulvdberge)
+- When shift clicking a recipe in the Crafting Grid, the player's inventory is now leveraged as well (raoulvdberge)
 
 ### 0.9.4
 - Little fixes in German translation (ThexXTURBOXx)
diff --git a/src/main/java/refinedstorage/network/MessageGridCraftingTransfer.java b/src/main/java/refinedstorage/network/MessageGridCraftingTransfer.java
index 70cb3061a..641596d8c 100755
--- a/src/main/java/refinedstorage/network/MessageGridCraftingTransfer.java
+++ b/src/main/java/refinedstorage/network/MessageGridCraftingTransfer.java
@@ -53,7 +53,7 @@ public class MessageGridCraftingTransfer extends MessageHandlerPlayerToServer<Me
                     }
                 }
 
-                ((TileGrid) grid).onRecipeTransfer(actualRecipe);
+                ((TileGrid) grid).onRecipeTransfer(player, actualRecipe);
             }
         }
     }
diff --git a/src/main/java/refinedstorage/tile/grid/TileGrid.java b/src/main/java/refinedstorage/tile/grid/TileGrid.java
index 07d34e308..17ef8070b 100755
--- a/src/main/java/refinedstorage/tile/grid/TileGrid.java
+++ b/src/main/java/refinedstorage/tile/grid/TileGrid.java
@@ -10,6 +10,7 @@ import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.network.datasync.DataSerializers;
 import net.minecraft.util.math.BlockPos;
 import net.minecraftforge.items.IItemHandler;
+import net.minecraftforge.items.ItemHandlerHelper;
 import net.minecraftforge.items.wrapper.CombinedInvWrapper;
 import net.minecraftforge.items.wrapper.InvWrapper;
 import refinedstorage.RefinedStorage;
@@ -333,7 +334,7 @@ public class TileGrid extends TileNode implements IGrid {
         return result.getStackInSlot(0) != null && patterns.getStackInSlot(1) == null && patterns.getStackInSlot(0) != null;
     }
 
-    public void onRecipeTransfer(ItemStack[][] recipe) {
+    public void onRecipeTransfer(EntityPlayer player, ItemStack[][] recipe) {
         if (isConnected()) {
             for (int i = 0; i < matrix.getSizeInventory(); ++i) {
                 ItemStack slot = matrix.getStackInSlot(i);
@@ -356,15 +357,39 @@ public class TileGrid extends TileNode implements IGrid {
                     ItemStack[] possibilities = recipe[i];
 
                     if (getType() == EnumGridType.CRAFTING) {
+                        boolean found = false;
+
                         for (ItemStack possibility : possibilities) {
                             ItemStack took = NetworkUtils.extractItem(network, possibility, 1);
 
                             if (took != null) {
                                 matrix.setInventorySlotContents(i, took);
 
+                                found = true;
+
                                 break;
                             }
                         }
+
+                        if (!found) {
+                            for (ItemStack possibility : possibilities) {
+                                for (int j = 0; j < player.inventory.getSizeInventory(); ++j) {
+                                    if (CompareUtils.compareStackNoQuantity(possibility, player.inventory.getStackInSlot(j))) {
+                                        matrix.setInventorySlotContents(i, ItemHandlerHelper.copyStackWithSize(player.inventory.getStackInSlot(j), 1));
+
+                                        player.inventory.decrStackSize(j, 1);
+
+                                        found = true;
+
+                                        break;
+                                    }
+                                }
+
+                                if (found) {
+                                    break;
+                                }
+                            }
+                        }
                     } else if (getType() == EnumGridType.PATTERN) {
                         matrix.setInventorySlotContents(i, possibilities[0]);
                     }