diff --git a/items/storage/ItemBasicStorageCell.java b/items/storage/ItemBasicStorageCell.java
index ca54beec..2268fbc7 100644
--- a/items/storage/ItemBasicStorageCell.java
+++ b/items/storage/ItemBasicStorageCell.java
@@ -178,8 +178,7 @@ public class ItemBasicStorageCell extends AEBaseItem implements IStorageCell, II
 		return true;
 	}
 
-	@Override
-	public boolean onItemUseFirst(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ)
+	private boolean dissassembleDrive(ItemStack stack, World world, EntityPlayer player)
 	{
 		if ( player.isSneaking() )
 		{
@@ -213,4 +212,17 @@ public class ItemBasicStorageCell extends AEBaseItem implements IStorageCell, II
 		}
 		return false;
 	}
+
+	@Override
+	public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player)
+	{
+		dissassembleDrive( stack, world, player );
+		return stack;
+	}
+
+	@Override
+	public boolean onItemUseFirst(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ)
+	{
+		return dissassembleDrive( stack, world, player );
+	}
 }