diff --git a/src/main/java/refinedstorage/gui/GuiBase.java b/src/main/java/refinedstorage/gui/GuiBase.java
index 25c02d4c9..6fcdc1e16 100755
--- a/src/main/java/refinedstorage/gui/GuiBase.java
+++ b/src/main/java/refinedstorage/gui/GuiBase.java
@@ -137,7 +137,7 @@ public abstract class GuiBase extends GuiContainer {
     }
 
     public void drawItem(int x, int y, ItemStack stack) {
-        drawItem(x, y, stack, false, null);
+        drawItem(x, y, stack, false);
     }
 
     public void drawItem(int x, int y, ItemStack stack, boolean withOverlay) {
@@ -185,7 +185,9 @@ public abstract class GuiBase extends GuiContainer {
     }
 
     public void drawTooltip(int x, int y, ItemStack stack) {
+        GL11.glDisable(GL11.GL_LIGHTING);
         renderToolTip(stack, x, y);
+        GL11.glEnable(GL11.GL_LIGHTING);
     }
 
     public void drawTexture(int x, int y, int textureX, int textureY, int width, int height) {
diff --git a/src/main/java/refinedstorage/gui/GuiController.java b/src/main/java/refinedstorage/gui/GuiController.java
index 62f7548bc..057f4a2e8 100755
--- a/src/main/java/refinedstorage/gui/GuiController.java
+++ b/src/main/java/refinedstorage/gui/GuiController.java
@@ -70,6 +70,10 @@ 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);
+                }
+
                 drawItem(x, y, machineStack);
                 drawString(x + 21, y + 5, t("misc.refinedstorage:energy_usage_minimal", machine.getEnergyUsage()));
             }