diff --git a/src/main/java/appeng/client/gui/implementations/GuiInterfaceTerminal.java b/src/main/java/appeng/client/gui/implementations/GuiInterfaceTerminal.java
index cd99c914a1b..30405566261 100644
--- a/src/main/java/appeng/client/gui/implementations/GuiInterfaceTerminal.java
+++ b/src/main/java/appeng/client/gui/implementations/GuiInterfaceTerminal.java
@@ -31,6 +31,7 @@
 import appeng.client.me.ClientDCInternalInv;
 import appeng.client.me.SlotDisconnected;
 import appeng.container.implementations.ContainerInterfaceTerminal;
+import appeng.container.implementations.ContainerWirelessInterfaceTerminal;
 import appeng.container.slot.AppEngSlot;
 import appeng.core.AEConfig;
 import appeng.core.AppEng;
@@ -127,7 +128,7 @@ public GuiInterfaceTerminal(final InventoryPlayer inventoryPlayer, final PartInt
     }
 
     public GuiInterfaceTerminal(final InventoryPlayer inventoryPlayer, final WirelessTerminalGuiObject guiObject) {
-        super(new ContainerInterfaceTerminal(inventoryPlayer, guiObject));
+        super(new ContainerWirelessInterfaceTerminal(inventoryPlayer, guiObject));
 
         final GuiScrollbar scrollbar = new GuiScrollbar();
         this.setScrollBar(scrollbar);
diff --git a/src/main/java/appeng/container/implementations/ContainerInterfaceTerminal.java b/src/main/java/appeng/container/implementations/ContainerInterfaceTerminal.java
index 7799b66f3bf..68be538a6c9 100644
--- a/src/main/java/appeng/container/implementations/ContainerInterfaceTerminal.java
+++ b/src/main/java/appeng/container/implementations/ContainerInterfaceTerminal.java
@@ -88,7 +88,7 @@ public ContainerInterfaceTerminal(final InventoryPlayer ip, final PartInterfaceT
         this.bindPlayerInventory(ip, 0, 0);
     }
 
-    public ContainerInterfaceTerminal(final InventoryPlayer ip, final WirelessTerminalGuiObject guiObject) {
+    public ContainerInterfaceTerminal(final InventoryPlayer ip, final WirelessTerminalGuiObject guiObject, boolean bindInventory) {
         super(ip, guiObject);
 
         if (Platform.isServer()) {
@@ -98,7 +98,9 @@ public ContainerInterfaceTerminal(final InventoryPlayer ip, final WirelessTermin
             }
         }
 
-        this.bindPlayerInventory(ip, 0, 0);
+        if (bindInventory) {
+            this.bindPlayerInventory(ip, 0, 0);
+        }
     }
 
     @Override
diff --git a/src/main/java/appeng/container/implementations/ContainerWirelessInterfaceTerminal.java b/src/main/java/appeng/container/implementations/ContainerWirelessInterfaceTerminal.java
index cc96c53b28b..167f2bdef9e 100644
--- a/src/main/java/appeng/container/implementations/ContainerWirelessInterfaceTerminal.java
+++ b/src/main/java/appeng/container/implementations/ContainerWirelessInterfaceTerminal.java
@@ -19,7 +19,7 @@ public class ContainerWirelessInterfaceTerminal extends ContainerInterfaceTermin
     private int ticks = 0;
 
     public ContainerWirelessInterfaceTerminal(InventoryPlayer ip, WirelessTerminalGuiObject guiObject) {
-        super(ip, guiObject);
+        super(ip, guiObject,false);
 
         if (guiObject != null) {
             final int slotIndex = guiObject.getInventorySlot();
@@ -28,10 +28,12 @@ public ContainerWirelessInterfaceTerminal(InventoryPlayer ip, WirelessTerminalGu
             }
             this.slot = slotIndex;
         } else {
-            this.slot = -1;
             this.lockPlayerInventorySlot(ip.currentItem);
+            this.slot = -1;
         }
 
+        this.bindPlayerInventory(ip,0,0);
+
         this.wirelessTerminalGUIObject = guiObject;
     }