Index: GuiHandler.cpp
===================================================================
--- GuiHandler.cpp	(revision 6992)
+++ GuiHandler.cpp	(working copy)
@@ -1052,7 +1052,16 @@
 		activeMousePress=true;
 	}
 	else if (AboveGui(x,y)) {
-		activeMousePress = true;
+		//handle click here
+		//activeMousePress stays false so MouseRelease will be ignored
+		const int iconPos = IconAtPos(x, y);
+		if (iconPos >= 0) {
+			const int iconCmd = icons[iconPos].commandsID;
+			if ((iconCmd >= 0) && (iconCmd < commands.size())) {
+				const bool rmb = (button == SDL_BUTTON_RIGHT);
+				SetActiveCommand(iconCmd, rmb);
+			}
+		}
 		return true;
 	}
 	else if (minimap && minimap->IsAbove(x, y)) {
@@ -1084,7 +1093,6 @@
 void CGuiHandler::MouseRelease(int x, int y, int button, float3& camerapos, float3& mousedir)
 {
 //	GML_RECMUTEX_LOCK(gui); // not needed, draw thread + read only
-	int iconCmd = -1;
 
 	if (activeMousePress) {
 		activeMousePress = false;
@@ -1100,28 +1108,14 @@
 
 	if (button < 0) {
 		button = -button; // proxied click from the minimap
-	} else {
-		// setup iconCmd
-		if ((iconCmd < 0) && !game->hideInterface) {
-			const int iconPos = IconAtPos(x, y);
-			if (iconPos >= 0) {
-				iconCmd = icons[iconPos].commandsID;
-			}
-		}
 	}
 
-	if ((button == SDL_BUTTON_RIGHT) && (iconCmd == -1)) {
+	if (button == SDL_BUTTON_RIGHT) {
 		// right click -> set the default cmd
 		inCommand = defaultCmdMemory;
 		defaultCmdMemory = -1;
 	}
 
-	if ((iconCmd >= 0) && (iconCmd < commands.size())) {
-		const bool rmb = (button == SDL_BUTTON_RIGHT);
-		SetActiveCommand(iconCmd, rmb);
-		return;
-	}
-
 	// not over a button, try to execute a command
 	Command c = GetCommand(x, y, button, false, camerapos, mousedir);