diff --git a/src/app/App.tsx b/src/app/App.tsx
index 1d91b3fa..fd9d8639 100644
--- a/src/app/App.tsx
+++ b/src/app/App.tsx
@@ -1326,9 +1326,6 @@ export function App({ store, initialStatusMessage }: AppProps) {
       return;
     }
 
-    blurActiveTextEntry();
-    store.setViewportPanelViewMode(panelId, nextViewMode);
-
     if (
       editorState.viewportTransientState.toolPreview.kind === "box-create" &&
       editorState.viewportTransientState.toolPreview.sourcePanelId === panelId
@@ -1336,6 +1333,9 @@ export function App({ store, initialStatusMessage }: AppProps) {
       store.clearViewportToolPreview(panelId);
     }
 
+    blurActiveTextEntry();
+    store.setViewportPanelViewMode(panelId, nextViewMode);
+
     setStatusMessage(`Set the ${getViewportPanelLabel(panelId)} panel to ${getViewportViewModeLabel(nextViewMode)} view.`);
   };