diff --git a/src/components/ContainerComponents/ViewContainer/ViewContainer.tsx b/src/components/ContainerComponents/ViewContainer/ViewContainer.tsx
index f6a52899d384492070957adcbdb96ef78d9af286..0ed47c2b050ab45cbbb87c80db06c647b44cf092 100644
--- a/src/components/ContainerComponents/ViewContainer/ViewContainer.tsx
+++ b/src/components/ContainerComponents/ViewContainer/ViewContainer.tsx
@@ -28,8 +28,8 @@ export const ViewContainer = () => {
       <Layout>
         <AppContextProvider>
           <Navbar />
+          <WelcomeModalContainer />
           <Main>
-            <WelcomeModalContainer />
             <Content className="app-content">
               <ScrollToTop>
                 <Switch>
diff --git a/src/components/ContainerComponents/WelcomeModalContainer/WelcomeModalContainer.tsx b/src/components/ContainerComponents/WelcomeModalContainer/WelcomeModalContainer.tsx
index 5f7941aa3545ac8a1921245540ca41b144b8b62f..401843f8ca4ac4c6ef48114d839ee502bb02e8ea 100644
--- a/src/components/ContainerComponents/WelcomeModalContainer/WelcomeModalContainer.tsx
+++ b/src/components/ContainerComponents/WelcomeModalContainer/WelcomeModalContainer.tsx
@@ -41,7 +41,9 @@ const WelcomeModalContainer: React.FC<WelcomeModalContainerProps> = ({
         .query(client.find(USERPROFILE_DOCTYPE).limitBy(1))
         .then(async ({ data }) => {
           const welcomeModalState = data[0].haveSeenWelcomeModal
-          setModalOpen(!welcomeModalState)
+          if (!welcomeModalState) {
+            setModalOpen(true)
+          }
         })
     }
     getWelcomeModalState()