diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0703c1fb1..492ffd4e9 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,7 @@
 - Fixed items disappearing in Grid when doing a weird combination of inputs
 - Fixed Solderer not stacking items
 - Fixed Importer voiding Storage Disks from the Disk Drive
+- Fixed Controller not saving energy
 
 **Features**
 - Added autocrafting
@@ -32,9 +33,9 @@
 
 ### 0.5.6
 **Bugfixes**
-- Fix sorting crash
-- Fix autofocusing on priority field in storage GUIs
-- Fix controller causing lag when energy level changes
+- Fixed sorting crash
+- Fixed autofocusing on priority field in storage GUIs
+- Fixed controller causing lag when energy level changes
 
 ### 0.5.5
 **Bugfixes**
diff --git a/src/main/java/refinedstorage/item/ItemStorageDisk.java b/src/main/java/refinedstorage/item/ItemStorageDisk.java
index 27877f524..730041171 100755
--- a/src/main/java/refinedstorage/item/ItemStorageDisk.java
+++ b/src/main/java/refinedstorage/item/ItemStorageDisk.java
@@ -51,7 +51,7 @@ public class ItemStorageDisk extends ItemBase {
 
     @Override
     public ActionResult<ItemStack> onItemRightClick(ItemStack stack, World world, EntityPlayer player, EnumHand hand) {
-        if (!world.isRemote && NBTStorage.getStored(stack.getTagCompound()) == 0 && stack.getMetadata() != TYPE_CREATIVE) {
+        if (!world.isRemote && player.isSneaking() && NBTStorage.getStored(stack.getTagCompound()) == 0 && stack.getMetadata() != TYPE_CREATIVE) {
             ItemStack storagePart = new ItemStack(RefinedStorageItems.STORAGE_PART, 1, stack.getMetadata());
 
             if (!player.inventory.addItemStackToInventory(storagePart.copy())) {