diff --git a/src/video/cocoa/SDL_cocoaevents.m b/src/video/cocoa/SDL_cocoaevents.m
index 8a94e0d60..57532a46c 100644
--- a/src/video/cocoa/SDL_cocoaevents.m
+++ b/src/video/cocoa/SDL_cocoaevents.m
@@ -201,8 +201,8 @@ Cocoa_PumpEvents(_THIS)
         case NSLeftMouseDragged:
         case NSRightMouseDragged:
         case NSOtherMouseDragged: /* usually middle mouse dragged */
-        case NSScrollWheel:
         case NSMouseMoved:
+        case NSScrollWheel:
             Cocoa_HandleMouseEvent(_this, event);
             /* Pass through to NSApp to make sure everything stays in sync */
             [NSApp sendEvent:event];
diff --git a/src/video/cocoa/SDL_cocoamouse.m b/src/video/cocoa/SDL_cocoamouse.m
index fd8b74a3b..a041c09cf 100644
--- a/src/video/cocoa/SDL_cocoamouse.m
+++ b/src/video/cocoa/SDL_cocoamouse.m
@@ -43,7 +43,7 @@ ConvertMouseButtonToSDL(int button)
         case 2:
             return(SDL_BUTTON_MIDDLE); /* 2 */
     }
-    return button;
+    return button+1;
 }
 
 void