diff --git a/.npmrc b/.npmrc
new file mode 100644
index 0000000..5bee2d4
--- /dev/null
+++ b/.npmrc
@@ -0,0 +1,3 @@
+# https://pnpm.io/npmrc#shamefully-hoist
+# Fixes: WARN Failed to resolve dependency: @supabase/gotrue-js, present in 'optimizeDeps.include'
+shamefully-hoist=true
diff --git a/app.vue b/app.vue
index ce4444b..ffcefe3 100644
--- a/app.vue
+++ b/app.vue
@@ -31,6 +31,8 @@ const useIdFunction = () => useId()
 
 <template>
   <div class="h-screen">
+    <NuxtLoadingIndicator />
+
     <NuxtLayout>
       <ConfigProvider :use-id="useIdFunction">
         <NuxtPage/>
diff --git a/components/global/user/CTA.vue b/components/global/user/CTA.vue
index 692aeb8..da3558d 100644
--- a/components/global/user/CTA.vue
+++ b/components/global/user/CTA.vue
@@ -8,7 +8,13 @@ const router = useRouter()
 const { auth } = useSupabaseClient()
 const user = useSupabaseUser()
 const userMeta = computed(() => user.value?.user_metadata)
-const hasSession = computed(() => Boolean(user.value))
+
+const menuOpened = ref<boolean>(false)
+
+function closeMenu() {
+  menuOpened.value = false
+}
+watch(user, closeMenu)
 
 async function handleGoogleLogin() {
   try {
@@ -43,9 +49,9 @@ function gotoProfilePage() {
 
 <template>
   <ClientOnly>
-    <UiPopover>
-      <UiPopoverTrigger :as-child="hasSession">
-        <UiAvatar v-if="hasSession" class="cursor-pointer">
+    <UiPopover v-model:open="menuOpened">
+      <UiPopoverTrigger>
+        <UiAvatar v-if="user" class="cursor-pointer">
           <UiAvatarImage
             :src="userMeta?.avatar_url"
             :alt="userMeta?.full_name"
@@ -58,19 +64,17 @@ function gotoProfilePage() {
         </UiButton>
       </UiPopoverTrigger>
       <UiPopoverContent class="w-fit p-0" :align="'start'" :side="'top'" :collision-padding="20">
-        <div id="user-popover">
-          <UiCommand>
-            <UiCommandList v-if="user">
-              <UiCommandGroup :heading="`Connecté en tant que ${user?.email}`">
-                <UiCommandItem value="profile" @select="gotoProfilePage"> Profil </UiCommandItem>
-                <UiCommandItem value="logout" @select="handleLogout"> Déconnexion </UiCommandItem>
-              </UiCommandGroup>
-            </UiCommandList>
-            <UiCommandList v-else>
-              <UiCommandItem value="logout" @select="handleGoogleLogin"> Connexion </UiCommandItem>
-            </UiCommandList>
-          </UiCommand>
-        </div>
+        <UiCommand>
+          <UiCommandList v-if="user">
+            <UiCommandGroup :heading="`Connecté en tant que ${user?.email}`">
+              <UiCommandItem value="profile" @select="gotoProfilePage"> Profil </UiCommandItem>
+              <UiCommandItem value="logout" @select="handleLogout"> Déconnexion </UiCommandItem>
+            </UiCommandGroup>
+          </UiCommandList>
+          <UiCommandList v-else>
+            <UiCommandItem value="logout" @select="handleGoogleLogin"> Connexion </UiCommandItem>
+          </UiCommandList>
+        </UiCommand>
       </UiPopoverContent>
     </UiPopover>
   </ClientOnly>
diff --git a/package.json b/package.json
index 9f01aad..d26d145 100644
--- a/package.json
+++ b/package.json
@@ -21,7 +21,7 @@
     "class-variance-authority": "^0.7.0",
     "clsx": "^2.1.1",
     "lucide-vue-next": "^0.364.0",
-    "nuxt": "^3.11.2",
+    "nuxt": "^3.7.0",
     "pinia": "^2.1.7",
     "radix-vue": "^1.7.4",
     "shadcn-nuxt": "^0.10.4",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index d05267c..bb0846d 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -33,7 +33,7 @@ importers:
         specifier: ^0.364.0
         version: 0.364.0(vue@3.4.27(typescript@5.4.5))
       nuxt:
-        specifier: ^3.11.2
+        specifier: ^3.7.0
         version: 3.11.2(@opentelemetry/api@1.8.0)(@parcel/watcher@2.4.1)(@types/node@20.12.11)(@unocss/reset@0.60.2)(encoding@0.1.13)(eslint@8.57.0)(floating-vue@5.2.2(@nuxt/kit@3.11.2(rollup@4.17.2))(vue@3.4.27(typescript@5.4.5)))(ioredis@5.4.1)(optionator@0.9.4)(rollup@4.17.2)(sass@1.77.1)(terser@5.31.0)(typescript@5.4.5)(unocss@0.60.2(postcss@8.4.38)(rollup@4.17.2)(vite@5.2.11(@types/node@20.12.11)(sass@1.77.1)(terser@5.31.0)))(vite@5.2.11(@types/node@20.12.11)(sass@1.77.1)(terser@5.31.0))
       pinia:
         specifier: ^2.1.7