diff --git a/packages/edit-site/src/components/sync-state-with-url/use-sync-canvas-mode-with-url.js b/packages/edit-site/src/components/sync-state-with-url/use-sync-canvas-mode-with-url.js
index a541ec652fee8..f6f70f528f87e 100644
--- a/packages/edit-site/src/components/sync-state-with-url/use-sync-canvas-mode-with-url.js
+++ b/packages/edit-site/src/components/sync-state-with-url/use-sync-canvas-mode-with-url.js
@@ -57,7 +57,6 @@ export default function useSyncCanvasModeWithURL() {
 	}, [ canvasMode, history ] );
 
 	useEffect( () => {
-		currentCanvasInUrl.current = canvasInUrl;
 		if (
 			canvasInUrl === undefined &&
 			currentCanvasMode.current !== 'view'
@@ -69,5 +68,6 @@ export default function useSyncCanvasModeWithURL() {
 		) {
 			setCanvasMode( 'edit' );
 		}
+		currentCanvasInUrl.current = canvasInUrl;
 	}, [ canvasInUrl, setCanvasMode ] );
 }