diff --git a/vospace-ui-frontend/src/components/FAQMenuItem.vue b/vospace-ui-frontend/src/components/FAQMenuItem.vue
new file mode 100644
index 0000000000000000000000000000000000000000..03239e639308596260bd8ff40d9cc3d8db83165a
--- /dev/null
+++ b/vospace-ui-frontend/src/components/FAQMenuItem.vue
@@ -0,0 +1,8 @@
+<!--
+  This file is part of vospace-ui
+  Copyright (C) 2021 Istituto Nazionale di Astrofisica
+  SPDX-License-Identifier: GPL-3.0-or-later
+-->
+<template>
+<b-nav-item right v-b-modal.modal-faq>FAQ</b-nav-item>
+</template>
diff --git a/vospace-ui-frontend/src/components/Jobs.vue b/vospace-ui-frontend/src/components/Jobs.vue
index c77089cb97f499dfe63929cf608114fc4112470d..ade7775fcf1ac44da8f3c1dba2262657c601e5d0 100644
--- a/vospace-ui-frontend/src/components/Jobs.vue
+++ b/vospace-ui-frontend/src/components/Jobs.vue
@@ -37,11 +37,17 @@
       <b-spinner variant="primary" style="width: 3rem; height: 3rem;" label="Loading"></b-spinner>
     </div>
   </div>
+  <FAQModal/>
 </div>
 </template>
 
 <script>
+import FAQModal from './modal/FAQModal.vue'
+
 export default {
+  components: {
+    FAQModal
+  },
   computed: {
     jobs() { return this.$store.state.jobs },
     jobsLoading() { return this.$store.state.jobsLoading }
diff --git a/vospace-ui-frontend/src/components/TopMenu.vue b/vospace-ui-frontend/src/components/TopMenu.vue
index 3fbcf2f06fa40c73d31efb4f9f2fa7194d33d9ce..b921d8ef2a22d2f16bce11bcac57f4dd7d358137 100644
--- a/vospace-ui-frontend/src/components/TopMenu.vue
+++ b/vospace-ui-frontend/src/components/TopMenu.vue
@@ -9,7 +9,8 @@
     <b-navbar-brand href="#/" class="d-none d-md-block">VOSpace<sup>BETA</sup></b-navbar-brand>
     <JobsMenuItem />
     <b-navbar-nav class="ml-auto">
-      <b-nav-item right v-b-modal.modal-faq>FAQ</b-nav-item>
+      <!--<b-nav-item right v-b-modal.modal-faq href="#">FAQ</b-nav-item>-->
+      <FAQMenuItem />
       <b-nav-item href="login" class="mr-4" v-if="user === 'anonymous'">Login</b-nav-item>
       <b-nav-item-dropdown :text="user" right v-if="user !== 'anonymous'">
         <b-dropdown-item href="vospace-logout">Logout</b-dropdown-item>
@@ -21,10 +22,12 @@
 
 <script>
 import JobsMenuItem from './JobsMenuItem.vue';
+import FAQMenuItem from './FAQMenuItem.vue';
 
 export default {
   components: {
-    JobsMenuItem
+    JobsMenuItem,
+    FAQMenuItem
   },
   computed: {
     user() { return this.$store.state.user }