diff --git a/src/main/java/appeng/container/implementations/ContainerMEPortableCell.java b/src/main/java/appeng/container/implementations/ContainerMEPortableCell.java
index a553020b8..2798f3da6 100644
--- a/src/main/java/appeng/container/implementations/ContainerMEPortableCell.java
+++ b/src/main/java/appeng/container/implementations/ContainerMEPortableCell.java
@@ -36,7 +36,7 @@ public class ContainerMEPortableCell extends ContainerMEMonitorable implements I
     private int ticks = 0;
 
     public ContainerMEPortableCell(InventoryPlayer ip, IPortableCell guiObject) {
-        super(ip, guiObject, guiObject, true);
+        super(ip, guiObject, guiObject, false);
         if (guiObject != null) {
             final int slotIndex = ((IInventorySlotAware) guiObject).getInventorySlot();
             if (!((IInventorySlotAware) guiObject).isBaubleSlot()) {
@@ -47,6 +47,9 @@ public class ContainerMEPortableCell extends ContainerMEMonitorable implements I
             this.slot = -1;
             this.lockPlayerInventorySlot(ip.currentItem);
         }
+
+        this.bindPlayerInventory(ip, 0, 0);
+
         this.portableCell = guiObject;
     }
 
diff --git a/src/main/java/appeng/container/implementations/ContainerMEPortableTerminal.java b/src/main/java/appeng/container/implementations/ContainerMEPortableTerminal.java
index c2a0301a1..226abe668 100644
--- a/src/main/java/appeng/container/implementations/ContainerMEPortableTerminal.java
+++ b/src/main/java/appeng/container/implementations/ContainerMEPortableTerminal.java
@@ -65,6 +65,9 @@ public class ContainerMEPortableTerminal extends ContainerMEMonitorable implemen
             this.slot = -1;
             this.lockPlayerInventorySlot(ip.currentItem);
         }
+
+        this.bindPlayerInventory(ip, 0, 0);
+
         this.wirelessTerminalGUIObject = guiObject;
         this.upgrades = new StackUpgradeInventory(wirelessTerminalGUIObject.getItemStack(), this, 2);
         this.loadFromNBT();
@@ -107,7 +110,7 @@ public class ContainerMEPortableTerminal extends ContainerMEMonitorable implemen
                     if (wirelessTerminalGUIObject.isBaubleSlot()) {
                         BaublesApi.getBaublesHandler(this.getPlayerInv().player).setStackInSlot(this.slot, this.wirelessTerminalGUIObject.getItemStack());
                     } else {
-                        this.getPlayerInv().setInventorySlotContents(this.getPlayerInv().currentItem, this.wirelessTerminalGUIObject.getItemStack());
+                        this.getPlayerInv().setInventorySlotContents(this.slot, this.wirelessTerminalGUIObject.getItemStack());
                     }
                 } else {
                     this.setValidContainer(false);
diff --git a/src/main/java/appeng/container/implementations/ContainerWirelessCraftingTerminal.java b/src/main/java/appeng/container/implementations/ContainerWirelessCraftingTerminal.java
index 8a5347b5b..3d79fe579 100644
--- a/src/main/java/appeng/container/implementations/ContainerWirelessCraftingTerminal.java
+++ b/src/main/java/appeng/container/implementations/ContainerWirelessCraftingTerminal.java
@@ -50,7 +50,7 @@ public class ContainerWirelessCraftingTerminal extends ContainerMEPortableTermin
     private IRecipe currentRecipe;
 
     public ContainerWirelessCraftingTerminal(final InventoryPlayer ip, final WirelessTerminalGuiObject gui) {
-        super(ip, gui, true);
+        super(ip, gui, false);
 
         final IItemHandler crafting = this.craftingGrid;
 
@@ -63,6 +63,8 @@ public class ContainerWirelessCraftingTerminal extends ContainerMEPortableTermin
         this.addSlotToContainer(this.outputSlot = new SlotCraftingTerm(this.getPlayerInv().player, this.getActionSource(), this
                 .getPowerSource(), this.wirelessTerminalGUIObject, crafting, crafting, this.output, 131, -72 + 18, this));
 
+        this.bindPlayerInventory(ip, 0, 0);
+
         this.onCraftMatrixChanged(new WrapperInvItemHandler(crafting));
     }
 
diff --git a/src/main/java/appeng/container/implementations/ContainerWirelessPatternTerminal.java b/src/main/java/appeng/container/implementations/ContainerWirelessPatternTerminal.java
index e3da6020b..fe364f0fc 100644
--- a/src/main/java/appeng/container/implementations/ContainerWirelessPatternTerminal.java
+++ b/src/main/java/appeng/container/implementations/ContainerWirelessPatternTerminal.java
@@ -138,7 +138,7 @@ public class ContainerWirelessPatternTerminal extends ContainerPatternEncoder im
                     if (wirelessTerminalGUIObject.isBaubleSlot()) {
                         BaublesApi.getBaublesHandler(this.getPlayerInv().player).setStackInSlot(this.slot, this.wirelessTerminalGUIObject.getItemStack());
                     } else {
-                        this.getPlayerInv().setInventorySlotContents(this.getPlayerInv().currentItem, this.wirelessTerminalGUIObject.getItemStack());
+                        this.getPlayerInv().setInventorySlotContents(this.slot, this.wirelessTerminalGUIObject.getItemStack());
                     }
                 } else {
                     this.setValidContainer(false);
diff --git a/src/main/java/appeng/container/implementations/ContainerWirelessTerm.java b/src/main/java/appeng/container/implementations/ContainerWirelessTerm.java
index a217b00ff..a8dd3cee7 100644
--- a/src/main/java/appeng/container/implementations/ContainerWirelessTerm.java
+++ b/src/main/java/appeng/container/implementations/ContainerWirelessTerm.java
@@ -26,6 +26,6 @@ import net.minecraft.entity.player.InventoryPlayer;
 public class ContainerWirelessTerm extends ContainerMEPortableTerminal {
 
     public ContainerWirelessTerm(final InventoryPlayer ip, final WirelessTerminalGuiObject gui) {
-        super(ip, gui, true);
+        super(ip, gui, false);
     }
 }
diff --git a/src/main/java/appeng/fluids/container/ContainerMEPortableFluidCell.java b/src/main/java/appeng/fluids/container/ContainerMEPortableFluidCell.java
index c55c066f2..ae60ce184 100644
--- a/src/main/java/appeng/fluids/container/ContainerMEPortableFluidCell.java
+++ b/src/main/java/appeng/fluids/container/ContainerMEPortableFluidCell.java
@@ -166,7 +166,7 @@ public class ContainerMEPortableFluidCell extends AEBaseContainer implements IAE
                     if (wirelessTerminalGUIObject.isBaubleSlot()) {
                         BaublesApi.getBaublesHandler(this.getPlayerInv().player).setStackInSlot(this.slot, this.wirelessTerminalGUIObject.getItemStack());
                     } else {
-                        this.getPlayerInv().setInventorySlotContents(this.getPlayerInv().currentItem, this.wirelessTerminalGUIObject.getItemStack());
+                        this.getPlayerInv().setInventorySlotContents(this.slot, this.wirelessTerminalGUIObject.getItemStack());
                     }
                 } else {
                     this.setValidContainer(false);