diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4e93e1e06..acc10a50c 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -41,6 +41,7 @@ NOTE: Worlds that used Refined Storage 1.5.x are fully compatible with Refined S
 - Fixed JEI recipe transferring in Pattern Grid allowing non-processing recipes in processing mode and vice-versa (raoulvdberge)
 - Fixed using Interfaces for minimum stock levels failing when requester is also an Interface (raoulvdberge)
 - Fixed ItemZoom incompatibility in Grid (raoulvdberge)
+- Fixed shift clicking upgrades into Interface making upgrades go to import slots (raoulvdberge)
 - Prevent accidental Grid scrollbar click after clicking JEI recipe transfer button (raoulvdberge)
 - Added a missing config option for Crafter Manager energy usage (raoulvdberge)
 - Added support for Disk Drive / Storage Block storage and capacity to OC integration (zangai)
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerInterface.java b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerInterface.java
index 19c2e1e2e..6bfd59b61 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerInterface.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerInterface.java
@@ -40,12 +40,14 @@ public class ContainerInterface extends ContainerBase {
         if (slot.getHasStack()) {
             stack = slot.getStack();
 
-            if (index < 9) {
+            if (index < 9 || (index >= 9 + 9 + 9 && index < 9 + 9 + 9 + 4)) {
                 if (!mergeItemStack(stack, 9 + 9 + 9 + 4, inventorySlots.size(), false)) {
                     return ItemStack.EMPTY;
                 }
-            } else if (!mergeItemStack(stack, 0, 9, false)) {
-                return ItemStack.EMPTY;
+            } else if (!mergeItemStack(stack, 9 + 9 + 9, 9 + 9 + 9 + 4, false)) {
+                if (!mergeItemStack(stack, 0, 9, false)) {
+                    return ItemStack.EMPTY;
+                }
             }
 
             if (stack.getCount() == 0) {