@@ -32,6 +32,7 @@ @interface MPLFigureCanvas () <CALayerDelegate>
 @implementation MPLFigureCanvas {
     BOOL _isLeftMouseDown;
     BOOL _isHandCursorActive;
+    NSInteger _emulatedLeftMouseDownButton;
     NSEventModifierFlags _previousModifierFlags;
     MPLRubberbandView *_rubberbandView;
     BOOL _needsDrawOnNextDisplayLayer;
@@ -324,11 +325,15 @@ - (void) _handleMouseDownOrUp:(NSEvent *)event isPress:(BOOL)isPress
         }
 
         _isLeftMouseDown = YES;
+        _emulatedLeftMouseDownButton = buttonNumber;
 
         [self _updateHandCursor];
 
     } else if ([event type] == NSEventTypeLeftMouseUp) {
-        _isLeftMouseDown = NO;
+        if (_isLeftMouseDown) {
+            buttonNumber = _emulatedLeftMouseDownButton;
+            _isLeftMouseDown = NO;
+        }
 
         [self _updateHandCursor];
     }