diff --git a/windows/window.c b/windows/window.c
index 5fe21787..85b4699d 100644
--- a/windows/window.c
+++ b/windows/window.c
@@ -3221,8 +3221,9 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
 		} else
 		    break;
 
-		if (send_raw_mouse && shift_pressed &&
-		    !(conf_get_int(conf, CONF_mouse_override))) {
+		if (send_raw_mouse &&
+		    !(conf_get_int(conf, CONF_mouse_override) &&
+                      shift_pressed)) {
 		    /* Mouse wheel position is in screen coordinates for
 		     * some reason */
 		    POINT p;