diff --git a/src/main/java/refinedstorage/gui/GuiController.java b/src/main/java/refinedstorage/gui/GuiController.java
index 057f4a2e8..bb579f6ff 100755
--- a/src/main/java/refinedstorage/gui/GuiController.java
+++ b/src/main/java/refinedstorage/gui/GuiController.java
@@ -62,6 +62,8 @@ public class GuiController extends GuiBase {
 
         RenderHelper.enableGUIStandardItemLighting();
 
+        ItemStack hoveringMachineStack = null;
+
         for (int i = 0; i < 4; ++i) {
             if (slot < controller.getMachines().size()) {
                 TileMachine machine = controller.getMachines().get(slot);
@@ -71,7 +73,7 @@ public class GuiController extends GuiBase {
                 ItemStack machineStack = new ItemStack(machineBlock, 1, machineBlock.getMetaFromState(machineState));
 
                 if (inBounds(x, y, 16, 16, mouseX, mouseY)) {
-                    drawTooltip(mouseX, mouseY, machineStack);
+                    hoveringMachineStack = machineStack;
                 }
 
                 drawItem(x, y, machineStack);
@@ -88,6 +90,10 @@ public class GuiController extends GuiBase {
             slot++;
         }
 
+        if (hoveringMachineStack != null) {
+            drawTooltip(mouseX, mouseY, hoveringMachineStack);
+        }
+
         if (inBounds(barX, barY, barWidth, barHeight, mouseX, mouseY)) {
             drawTooltip(mouseX, mouseY, t("misc.refinedstorage:energy_usage", controller.getEnergyUsage()) + "\n" + t("misc.refinedstorage:energy_stored", controller.getEnergyStored(null), controller.getMaxEnergyStored(null)));
         }