diff --git a/libs/shared/lib/querybuilder/panel/QueryBuilder.tsx b/libs/shared/lib/querybuilder/panel/QueryBuilder.tsx
index a05df9ba29c021d707c14288be57ba315f364fa2..ed7287ace5535a91c6082f665405acddb79f89b3 100644
--- a/libs/shared/lib/querybuilder/panel/QueryBuilder.tsx
+++ b/libs/shared/lib/querybuilder/panel/QueryBuilder.tsx
@@ -489,11 +489,12 @@ export const QueryBuilderInner = (props: QueryBuilderProps) => {
     setContextMenuOpen({ open: true, node: node, position: { x: event.clientX, y: event.clientY } });
   };
 
-  const onMove = useCallback(
+  const onMouseDown = useCallback(
     (event: MouseEvent | TouchEvent, viewport: Viewport) => {
       if (contextMenuOpen.open) {
         setContextMenuOpen({ ...contextMenuOpen, open: false });
       }
+      dispatch(resultSetFocus({ focusType: 'query' }))
     },
     [contextMenuOpen],
   );
@@ -629,13 +630,12 @@ export const QueryBuilderInner = (props: QueryBuilderProps) => {
           nodeTypes={nodeTypes}
           edgeTypes={edgeTypes}
           connectionLineComponent={ConnectionDragLine}
-          onMouseDownCapture={() => dispatch(resultSetFocus({ focusType: 'query' }))}
+          onMouseDownCapture={onMouseDown}
           // connectionMode={ConnectionMode.Loose}
           onInit={(reactFlowInstance) => {
             reactFlowInstanceRef.current = reactFlowInstance;
             onInit(reactFlowInstance);
           }}
-          onMove={onMove}
           onNodesChange={saveStateAuthorization.query.W ? onNodesChange : () => {}}
           onDragOver={saveStateAuthorization.query.W ? onDragOver : () => {}}
           onConnect={saveStateAuthorization.query.W ? onConnect : () => {}}