diff --git a/src/app/App.tsx b/src/app/App.tsx
index 7be543b2..cf0ece65 100644
--- a/src/app/App.tsx
+++ b/src/app/App.tsx
@@ -1381,8 +1381,8 @@ export function App({ store, initialStatusMessage }: AppProps) {
   const beginCreation = (toolPreview: CreationViewportToolPreview, status: string) => {
     blurActiveTextEntry();
     closeAddMenu();
-    store.setViewportToolPreview(toolPreview);
     store.setToolMode("create");
+    store.setViewportToolPreview(toolPreview);
     setStatusMessage(status);
   };