diff --git a/src/Kaleidoscope-MouseKeys.cpp b/src/Kaleidoscope-MouseKeys.cpp
index 9538e299..50b4203f 100644
--- a/src/Kaleidoscope-MouseKeys.cpp
+++ b/src/Kaleidoscope-MouseKeys.cpp
@@ -57,7 +57,7 @@ Key MouseKeys_::eventHandlerHook(Key mappedKey, byte row, byte col, uint8_t keyS
     if (mappedKey.flags != (SYNTHETIC | IS_MOUSE_KEY))
         return mappedKey;
 
-    if (mappedKey.keyCode & KEY_MOUSE_BUTTON) {
+    if (mappedKey.keyCode & KEY_MOUSE_BUTTON && !(mappedKey.keyCode & KEY_MOUSE_WARP)) {
         uint8_t button = mappedKey.keyCode & ~KEY_MOUSE_BUTTON;
 
         if (key_toggled_on(keyState)) {
diff --git a/src/MouseKeyDefs.h b/src/MouseKeyDefs.h
index 237eef24..de4d82c0 100644
--- a/src/MouseKeyDefs.h
+++ b/src/MouseKeyDefs.h
@@ -14,7 +14,7 @@
 #define KEY_MOUSE_RIGHT         B0001000
 #define KEY_MOUSE_BUTTON        B0010000
 #define KEY_MOUSE_WARP          B0100000
-#define KEY_MOUSE_WARP_END      B1000000
+#define KEY_MOUSE_WARP_END      B0010000
 
 
 #define Key_mouseWarpNW   (Key) { KEY_MOUSE_WARP| KEY_MOUSE_UP | KEY_MOUSE_LEFT, KEY_FLAGS|SYNTHETIC|IS_MOUSE_KEY }