diff --git a/packages/frontend-2/components/workspace/CreatePage.vue b/packages/frontend-2/components/workspace/CreatePage.vue
index 06eca3ef3..a2c555b66 100644
--- a/packages/frontend-2/components/workspace/CreatePage.vue
+++ b/packages/frontend-2/components/workspace/CreatePage.vue
@@ -25,7 +25,7 @@
     <WorkspaceWizard :workspace-id="workspaceId" />
 
     <div
-      v-if="requiresWorkspaceCreation && isFirstStep"
+      v-if="requiresWorkspaceCreation && isFirstStep && !registeredThisSession"
       class="w-full max-w-sm mx-auto mt-4"
     >
       <CommonAlert color="neutral" size="xs" hide-icon>
@@ -49,7 +49,7 @@ import { homeRoute } from '~~/lib/common/helpers/route'
 import { WizardSteps } from '~/lib/workspaces/helpers/types'
 import { useWorkspacesWizard } from '~/lib/workspaces/composables/wizard'
 import { useMixpanel } from '~/lib/core/composables/mp'
-import { useAuthManager } from '~/lib/auth/composables/auth'
+import { useAuthManager, useRegisteredThisSession } from '~/lib/auth/composables/auth'
 import { useQuery } from '@vue/apollo-composable'
 import { activeUserWorkspaceExistenceCheckQuery } from '~/lib/auth/graphql/queries'
 
@@ -61,6 +61,7 @@ const { currentStep, resetWizardState } = useWorkspacesWizard()
 const mixpanel = useMixpanel()
 const { logout } = useAuthManager()
 const isWorkspacesEnabled = useIsWorkspacesEnabled()
+const registeredThisSession = useRegisteredThisSession()
 
 const { result } = useQuery(activeUserWorkspaceExistenceCheckQuery, null, {
   enabled: isWorkspacesEnabled.value
diff --git a/packages/frontend-2/components/workspace/moveProject/Manager.vue b/packages/frontend-2/components/workspace/moveProject/Manager.vue
index 14c805ce9..d6e07742d 100644
--- a/packages/frontend-2/components/workspace/moveProject/Manager.vue
+++ b/packages/frontend-2/components/workspace/moveProject/Manager.vue
@@ -28,11 +28,7 @@
     />
     <template #buttons>
       <div class="-my-1 w-full flex justify-end">
-        <FormButton
-          v-if="!selectedProject"
-          color="outline"
-          @click="navigateTo(workspaceCreateRoute())"
-        >
+        <FormButton v-if="!selectedProject" color="outline" @click="open = false">
           Cancel
         </FormButton>
         <FormButton