diff --git a/rts/Game/UI/MouseHandler.cpp b/rts/Game/UI/MouseHandler.cpp
index 6084d54..0a0d478 100644
--- a/rts/Game/UI/MouseHandler.cpp
+++ b/rts/Game/UI/MouseHandler.cpp
@@ -42,6 +42,7 @@
 #include "Sound/Sound.h"
 #include "Sound/AudioChannel.h"
 #include <boost/cstdint.hpp>
+#include "math.h"
 
 // can't be up there since those contain conflicting definitions
 #include <SDL_mouse.h>
@@ -324,11 +325,17 @@ void CMouseHandler::MouseRelease(int x, int y, int button)
        }
 
        // Switch camera mode on a middle click that wasn't a middle mouse drag scroll.
-       // (the latter is determined by the time the mouse was held down:
-       //  <= 0.3 s means a camera mode switch, > 0.3 s means a drag scroll)
+       // (the latter is determined by the time the mouse was held down and current 
+       // position being less than 3 pixels away from the click
+       //  <= 0.3 s and < 3 px away (in x or y) means a camera mode switch, 
+       //  > 0.3 s means a drag scroll)
        if (button == SDL_BUTTON_MIDDLE) {
-               if (buttons[SDL_BUTTON_MIDDLE].time > (gu->gameTime - 0.3f))
+               ButtonPressEvt lastEvent = buttons[SDL_BUTTON_MIDDLE];
+               if ( lastEvent.time > (gu->gameTime - 0.3f)
+                                       && abs(lastEvent.x - lastx) < 3
+                                       && abs(lastEvent.y - lasty) < 3 ) {
                        ToggleState();
+               }
                return;
        }