diff --git a/front/src/ui/components/UserMenu.vue b/front/src/ui/components/UserMenu.vue
index 3bca7cf78..796226877 100644
--- a/front/src/ui/components/UserMenu.vue
+++ b/front/src/ui/components/UserMenu.vue
@@ -143,79 +143,46 @@ watchEffect(()=> {
         <i class="bi bi-question-square-fill" />
         {{ labels.support }}
         <template #items>
-          <PopoverItem>
-            <Link
-              to="https://forum.funkwhale.audio"
-            >
+          <PopoverItem to="https://forum.funkwhale.audio">
               <i class="bi-gear-fill" />
               {{ labels.forum }}
-            </Link>
           </PopoverItem>
-          <PopoverItem>
-            <Link
-              to="https://matrix.to/#/#funkwhale-support:matrix.org"
-            >
+          <PopoverItem to="https://matrix.to/#/#funkwhale-support:matrix.org">
               <i class="bi bi-chat-left-fill" />
               {{ labels.chat }}
-            </Link>
           </PopoverItem>
-          <PopoverItem>
-            <Link
-              to="https://dev.funkwhale.audio/funkwhale/funkwhale/issues"
-            >
+          <PopoverItem to="https://dev.funkwhale.audio/funkwhale/funkwhale/issues">
               <i class="bi-gitlab" />
               {{ labels.git }}
-            </Link>
           </PopoverItem>
         </template>
       </PopoverSubmenu>
-      <PopoverItem>
-        <nav class="button-list">
-          <Link
-            to="https://docs.funkwhale.audio"
-            class="item"
-            target="_blank"
-          >
-            <i class="bi bi-book" />
-            {{ labels.docs }}
-          </Link>
-        </nav>
+      <PopoverItem to="https://docs.funkwhale.audio">
+          <i class="bi bi-book" />
+          {{ labels.docs }}
       </PopoverItem>
-      <PopoverItem
-        @click.prevent="showShortcutsModal ()"
-      >
+      <PopoverItem @click.prevent="showShortcutsModal ()">
         <i class="bi bi-keyboard" />
         {{ labels.shortcuts }}
       </PopoverItem>
       <hr v-if="store.state.auth.authenticated"/>
       <PopoverItem v-if="store.state.auth.authenticated && route.path != '/logout'"
+        :to="{ name: 'logout' }"
       >
-        <nav class="button-list">
-          <Link :to="{ name: 'logout' }">
-            <i class="bi bi-box-arrow-right" />
-            {{ labels.logout }}
-          </Link>
-        </nav>
+        <i class="bi bi-box-arrow-right" />
+        {{ labels.logout }}
       </PopoverItem>
-      <PopoverItem v-if="!store.state.auth.authenticated">
-        <nav class="button-list">
-          <Link
-            :to="{ name: 'login' }"
-          >
-            <i class="bi-box-arrow-in-right" />
-            {{ labels.login }}
-          </Link>
-        </nav>
+      <PopoverItem v-if="!store.state.auth.authenticated"
+        :to="{ name: 'login' }"
+      >
+        <i class="bi-box-arrow-in-right" />
+        {{ labels.login }}
       </PopoverItem>
-      <PopoverItem v-if="!store.state.auth.authenticated && store.state.instance.settings.users.registration_enabled.value">
-        <nav class="button-list">
-          <Link
-            :to="{ name: 'signup' }"
-          >
-            <i class="bi bi-person-square" />
-            {{ labels.signup }}
-          </Link>
-        </nav>
+      <PopoverItem v-if="!store.state.auth.authenticated && store.state.instance.settings.users.registration_enabled.value"
+        :to="{ name: 'signup' }"
+      >
+        <i class="bi bi-person-square" />
+        {{ labels.signup }}
       </PopoverItem>
     </template>
   </Popover>