diff --git a/src/editor/editloop.cpp b/src/editor/editloop.cpp
index 9b113b5c7..f696a1f54 100644
--- a/src/editor/editloop.cpp
+++ b/src/editor/editloop.cpp
@@ -107,7 +107,6 @@ local int SelectedUnitIndex;		/// Unit type to draw
 
 local int CursorPlayer;			/// Player under the cursor
 local int SelectedPlayer;		/// Player selected for draw
-local int MouseButtonClicked;		/// Mouse button is pressed down
 
 /*----------------------------------------------------------------------------
 --	Functions
@@ -534,7 +533,7 @@ local void DrawUnitIcons(void)
 	    && CursorX < TheUI.ButtonPanelX + 24
 	    && TheUI.ButtonPanelY + 4 < CursorY
 	    && CursorY < TheUI.ButtonPanelY + 24
-	    && MouseButtonClicked) {
+	    && MouseButtons&LeftButton) {
 	VideoDraw(MenuButtonGfx.Sprite, MBUTTON_LEFT_ARROW + 1, x - 2, y);
     } else {
 	VideoDraw(MenuButtonGfx.Sprite, MBUTTON_LEFT_ARROW, x - 2, y);
@@ -543,7 +542,7 @@ local void DrawUnitIcons(void)
 	    && CursorX < TheUI.ButtonPanelX + 176 - 4
 	    && TheUI.ButtonPanelY + 4 < CursorY
 	    && CursorY < TheUI.ButtonPanelY + 24
-	    && MouseButtonClicked) {
+	    && MouseButtons&LeftButton) {
 	VideoDraw(MenuButtonGfx.Sprite, MBUTTON_RIGHT_ARROW + 1, x + j - 20, y);
     } else {
 	VideoDraw(MenuButtonGfx.Sprite, MBUTTON_RIGHT_ARROW, x + j - 20, y);
@@ -912,7 +911,6 @@ local void EditorCallbackButtonUp(unsigned button)
 	    ProcessMenu("menu-editor",1);
 	}
     }
-    MouseButtonClicked = 0;
 }
 
 /**
@@ -926,7 +924,6 @@ local void EditorCallbackButtonDown(unsigned button __attribute__ ((unused)))
 
     DebugLevel3Fn("%x %x\n" _C_ button _C_ MouseButtons);
 
-    MouseButtonClicked = 1;
     //
     //  Click on menu button
     //