diff --git a/examples/vite-app/package.json b/examples/vite-app/package.json
index 7e88c874..fe42723e 100644
--- a/examples/vite-app/package.json
+++ b/examples/vite-app/package.json
@@ -6,6 +6,7 @@
   "scripts": {
     "dev": "vite --port 3000 --open",
     "serve": "vite serve --port 3000",
+    "build": "vite build",
     "test:dev": "cypress open",
     "test": "pnpm test-component && pnpm test-e2e",
     "test-component": "cypress run --component",
diff --git a/packages/core/src/container/ZoomPane/index.tsx b/packages/core/src/container/ZoomPane/index.tsx
index 2099d9a1..ef5408e4 100644
--- a/packages/core/src/container/ZoomPane/index.tsx
+++ b/packages/core/src/container/ZoomPane/index.tsx
@@ -76,6 +76,7 @@ const ZoomPane = ({
   const prevTransform = useRef<Viewport>({ x: 0, y: 0, zoom: 0 });
   const { d3Zoom, d3Selection, d3ZoomHandler, userSelectionActive } = useStore(selector, shallow);
   const zoomActivationKeyPressed = useKeyPress(zoomActivationKeyCode);
+  const mouseButton = useRef<number>(0);
 
   useResizeHandler(zoomPane);
 
@@ -164,30 +165,6 @@ const ZoomPane = ({
     noWheelClassName,
   ]);
 
-  useEffect(() => {
-    if (d3Zoom) {
-      if (userSelectionActive && !isZoomingOrPanning.current) {
-        d3Zoom.on('zoom', null);
-      } else if (!userSelectionActive) {
-        d3Zoom.on('zoom', (event: D3ZoomEvent<HTMLDivElement, any>) => {
-          const { onViewportChange } = store.getState();
-          store.setState({ transform: [event.transform.x, event.transform.y, event.transform.k] });
-
-          zoomedWithRightMouseButton.current = !!(
-            onPaneContextMenu && isRightClickPan(panOnDrag, event.sourceEvent?.button)
-          );
-
-          if (onMove || onViewportChange) {
-            const flowTransform = eventToFlowTransform(event.transform);
-
-            onViewportChange?.(flowTransform);
-            onMove?.(event.sourceEvent as MouseEvent | TouchEvent, flowTransform);
-          }
-        });
-      }
-    }
-  }, [userSelectionActive, d3Zoom, onMove, panOnDrag, onPaneContextMenu]);
-
   useEffect(() => {
     if (d3Zoom) {
       d3Zoom.on('start', (event: D3ZoomEvent<HTMLDivElement, any>) => {
@@ -195,6 +172,9 @@ const ZoomPane = ({
           return null;
         }
 
+        // we need to remember it here, because it's always 0 in the "zoom" event
+        mouseButton.current = event.sourceEvent.button;
+
         const { onViewportChangeStart } = store.getState();
         isZoomingOrPanning.current = true;
 
@@ -213,6 +193,30 @@ const ZoomPane = ({
     }
   }, [d3Zoom, onMoveStart]);
 
+  useEffect(() => {
+    if (d3Zoom) {
+      if (userSelectionActive && !isZoomingOrPanning.current) {
+        d3Zoom.on('zoom', null);
+      } else if (!userSelectionActive) {
+        d3Zoom.on('zoom', (event: D3ZoomEvent<HTMLDivElement, any>) => {
+          const { onViewportChange } = store.getState();
+          store.setState({ transform: [event.transform.x, event.transform.y, event.transform.k] });
+
+          zoomedWithRightMouseButton.current = !!(
+            onPaneContextMenu && isRightClickPan(panOnDrag, mouseButton.current ?? 0)
+          );
+
+          if (onMove || onViewportChange) {
+            const flowTransform = eventToFlowTransform(event.transform);
+
+            onViewportChange?.(flowTransform);
+            onMove?.(event.sourceEvent as MouseEvent | TouchEvent, flowTransform);
+          }
+        });
+      }
+    }
+  }, [userSelectionActive, d3Zoom, onMove, panOnDrag, onPaneContextMenu]);
+
   useEffect(() => {
     if (d3Zoom) {
       d3Zoom.on('end', (event: D3ZoomEvent<HTMLDivElement, any>) => {
@@ -226,7 +230,7 @@ const ZoomPane = ({
 
         if (
           onPaneContextMenu &&
-          isRightClickPan(panOnDrag, event.sourceEvent?.button) &&
+          isRightClickPan(panOnDrag, mouseButton.current ?? 0) &&
           !zoomedWithRightMouseButton.current
         ) {
           onPaneContextMenu(event.sourceEvent);