diff --git a/packages/recorder/src/recorder.tsx b/packages/recorder/src/recorder.tsx
index 69f8983c3f..3b47c7d085 100644
--- a/packages/recorder/src/recorder.tsx
+++ b/packages/recorder/src/recorder.tsx
@@ -109,9 +109,11 @@ export const Recorder: React.FC<RecorderProps> = ({
   }, [paused]);
 
   const onEditorChange = React.useCallback((selector: string) => {
+    if (mode === 'none')
+      window.dispatch({ event: 'setMode', params: { mode: 'standby' } });
     setLocator(selector);
     window.dispatch({ event: 'selectorUpdated', params: { selector } });
-  }, []);
+  }, [mode]);
 
   return <div className='recorder'>
     <Toolbar>