diff --git a/client/gui/AEBaseGui.java b/client/gui/AEBaseGui.java
index 6690c25a1..2464fc270 100644
--- a/client/gui/AEBaseGui.java
+++ b/client/gui/AEBaseGui.java
@@ -373,7 +373,7 @@ public abstract class AEBaseGui extends GuiContainer
 			return;
 		}
 
-		if ( disableShiftClick == false )
+		if ( disableShiftClick == false && isShiftKeyDown() )
 		{
 			disableShiftClick = true;