diff --git a/src/components/App/index.tsx b/src/components/App/index.tsx
index 0b3a0ea39..117082abc 100644
--- a/src/components/App/index.tsx
+++ b/src/components/App/index.tsx
@@ -330,7 +330,7 @@ export const App = () => {
   }, [runningProjectId, setRunningProjectMessages])
 
   useEffect(() => {
-    if (isAdmin && !appMetaData?.title && !visible) {
+    if (!isAdmin && appMetaData?.title && !visible) {
       open()
     }
   }, [isAdmin, appMetaData?.title, open, visible])
@@ -350,27 +350,28 @@ export const App = () => {
       <Leva hidden={!isDevelopment || true} isRoot />
 
       <Suspense fallback={<div>Loading...</div>}>
-        {!splashDataLoading &&
-          (visible ? (
-            <Suspense fallback={<div>Loading Onboarding...</div>}>
-              <LazyOnboardingModal onSuccess={setUniverseQuestionIsOpen} />
-            </Suspense>
-          ) : (
-            <Wrapper direction="row">
-              <FormProvider {...form}>
-                <LazyMainToolbar />
-                {!universeQuestionIsOpen && <LazySideBar />}
-                <LazyUniverse />
-                <Overlay />
-                <AppBar />
-                <Version>v{version}</Version>
-                <ActionsToolbar />
-              </FormProvider>
-
-              <ModalsContainer />
-              <Toasts />
-            </Wrapper>
-          ))}
+        {visible && (
+          <Suspense fallback={<div>Loading Onboarding...</div>}>
+            <LazyOnboardingModal onSuccess={setUniverseQuestionIsOpen} />
+          </Suspense>
+        )}
+
+        {!visible && !splashDataLoading && (
+          <Wrapper direction="row">
+            <FormProvider {...form}>
+              <LazyMainToolbar />
+              {!universeQuestionIsOpen && <LazySideBar />}
+              <LazyUniverse />
+              <Overlay />
+              <AppBar />
+              <Version>v{version}</Version>
+              <ActionsToolbar />
+            </FormProvider>
+
+            <ModalsContainer />
+            <Toasts />
+          </Wrapper>
+        )}
       </Suspense>
     </>
   )