diff --git a/ui/src/components/header/ProjectMenu.vue b/ui/src/components/header/ProjectMenu.vue
index f3ea38bb9f1..d0a6b4ded84 100644
--- a/ui/src/components/header/ProjectMenu.vue
+++ b/ui/src/components/header/ProjectMenu.vue
@@ -20,12 +20,20 @@
     <a-select
       class="project-select"
       defaultValue="Default View"
-      :value="selectedProject"
+      :value="$store.getters.project.displaytext || $store.getters.project.name || 'Default View'"
       :disabled="isDisabled()"
       :filterOption="filterProject"
       @change="changeProject"
+      @focus="fetchData"
       showSearch>
-      <a-icon slot="suffixIcon" style="font-size:14px" type="project" />
+
+      <a-tooltip placement="bottom" slot="suffixIcon">
+        <template slot="title">
+          <span>{{ $t('projects') }}</span>
+        </template>
+        <a-icon style="font-size: 20px; color: #999; margin-top: -5px" type="project" />
+      </a-tooltip>
+
       <a-select-option v-for="(project, index) in projects" :key="index">
         {{ project.displaytext || project.name }}
       </a-select-option>
@@ -34,18 +42,14 @@
 </template>
 
 <script>
-import Vue from 'vue'
 import store from '@/store'
 import { api } from '@/api'
-import { CURRENT_PROJECT } from '@/store/mutation-types'
 
 export default {
   name: 'ProjectMenu',
   data () {
     return {
-      visible: false,
-      projects: [],
-      selectedProject: 'Default View'
+      projects: []
     }
   },
   mounted () {
@@ -56,24 +60,15 @@ export default {
       if (this.isDisabled()) {
         return
       }
-      // TODO: refactor fetching project list for project selector
-      this.projects = []
       var page = 1
       const getNextPage = () => {
         api('listProjects', { listAll: true, details: 'min', page: page, pageSize: 500 }).then(json => {
-          if (this.projects.length === 0) {
-            this.projects.push({ name: 'Default View' })
+          if (page === 1) {
+            this.projects = [{ name: 'Default View' }]
           }
           if (json && json.listprojectsresponse && json.listprojectsresponse.project) {
             this.projects.push(...json.listprojectsresponse.project)
           }
-          const currentProject = Vue.ls.get(CURRENT_PROJECT) || {}
-          for (var project of this.projects) {
-            if (project && currentProject && project.id === currentProject.id) {
-              this.setSelectedProject(project)
-              break
-            }
-          }
           if (this.projects.length - 1 < json.listprojectsresponse.count) {
             page++
             getNextPage()
@@ -85,12 +80,8 @@ export default {
     isDisabled () {
       return !Object.prototype.hasOwnProperty.call(store.getters.apis, 'listProjects')
     },
-    setSelectedProject (project) {
-      this.selectedProject = project.displaytext || project.name
-    },
     changeProject (index) {
       const project = this.projects[index]
-      this.setSelectedProject(project)
       this.$store.dispatch('SetProject', project)
       this.$store.dispatch('ToggleTheme', project.id === undefined ? 'light' : 'dark')
       this.$message.success(`Switched to "${project.name}"`)