diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0fbb8ac74..9b72d6e6a 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,10 +17,11 @@
 - Added German translation by ChillUpX
 - Grid Filters can now only filter 9 items, but, Grids take 4 filters now instead
 - Grid Filters can now be configured to compare on NBT and/ or damage
+- It is now possible to shift click items to the Storage Device filters
 - Updated to Forge 2046
 - Updated Tesla
 - Java 8 is now a requirement
-- Added MCMultiPart integration for Cables
+- Added MCMultiPart integration for Cable Parts
 
 ### 0.8.15
 **Bugfixes**
diff --git a/src/main/java/refinedstorage/container/ContainerDiskDrive.java b/src/main/java/refinedstorage/container/ContainerDiskDrive.java
index 3319de5ab..8b90b9004 100755
--- a/src/main/java/refinedstorage/container/ContainerDiskDrive.java
+++ b/src/main/java/refinedstorage/container/ContainerDiskDrive.java
@@ -35,7 +35,7 @@ public class ContainerDiskDrive extends ContainerStorage {
                     return null;
                 }
             } else if (!mergeItemStack(stack, 0, 8, false)) {
-                return null;
+                return mergeItemStackToSpecimen(stack, 8, 8 + 9);
             }
 
             if (stack.stackSize == 0) {
diff --git a/src/main/java/refinedstorage/container/ContainerStorage.java b/src/main/java/refinedstorage/container/ContainerStorage.java
index 24ea8343a..c085903f7 100755
--- a/src/main/java/refinedstorage/container/ContainerStorage.java
+++ b/src/main/java/refinedstorage/container/ContainerStorage.java
@@ -1,6 +1,8 @@
 package refinedstorage.container;
 
 import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.inventory.Slot;
+import net.minecraft.item.ItemStack;
 import net.minecraftforge.items.IItemHandler;
 import refinedstorage.container.slot.SlotSpecimen;
 import refinedstorage.tile.TileBase;
@@ -23,4 +25,15 @@ public class ContainerStorage extends ContainerBase {
 
         addPlayerInventory(8, 129);
     }
+
+    @Override
+    public ItemStack transferStackInSlot(EntityPlayer player, int index) {
+        Slot slot = getSlot(index);
+
+        if (slot != null && slot.getHasStack() && index >= 8) {
+            return mergeItemStackToSpecimen(slot.getStack(), 0, 9);
+        }
+
+        return null;
+    }
 }