diff --git a/src/components/Board/BoardSwitcher.vue b/src/components/Board/BoardSwitcher.vue
new file mode 100644
index 00000000..d0b15384
--- /dev/null
+++ b/src/components/Board/BoardSwitcher.vue
@@ -0,0 +1,53 @@
+<template lang="html">
+  <b-dropdown
+    v-if="hasMultipleBoards"
+    dropright
+    right
+    no-caret
+    boundary="viewport"
+    v-b-tooltip.hover.right
+    variant="transparent"
+    :title="$t('navMenu.changeBoard')"
+    :menu-class="nightMode ? 'bg-dark' : ''"
+  >
+    <template v-slot:button-content>
+      <icon name="arrow-switch" />
+    </template>
+
+    <b-dropdown-item
+      :to="`/board/${id}`"
+      :key="id"
+      v-for="{ name, id } in sortedBoards"
+      :variant="nightMode ? 'white' : 'transparent'"
+      :active="board.id === id"
+    >
+      {{ name }}
+    </b-dropdown-item>
+
+    <b-dropdown-divider />
+
+    <b-dropdown-item-button>
+      <create-board />
+    </b-dropdown-item-button>
+  </b-dropdown>
+</template>
+
+<script>
+import CreateBoard from '@/components/Board/CreateBoard';
+import { mapGetters, mapState } from 'vuex';
+
+export default {
+  components: {
+    CreateBoard,
+  },
+
+  computed: {
+    ...mapState(['board']),
+    ...mapGetters(['sortedBoards', 'nightMode']),
+
+    hasMultipleBoards() {
+      return this.$route.name === 'board' && this.board.name && this.sortedBoards.length > 1;
+    },
+  },
+};
+</script>
diff --git a/src/components/PageHeader.vue b/src/components/PageHeader.vue
index 004c5722..0ce0ac3d 100755
--- a/src/components/PageHeader.vue
+++ b/src/components/PageHeader.vue
@@ -10,37 +10,7 @@
       />
     </router-link>
 
-    <template v-if="hasMultipleBoards">
-      <b-dropdown
-        dropright
-        right
-        no-caret
-        boundary="viewport"
-        v-b-tooltip.hover.right
-        :title="$t('navMenu.changeBoard')"
-        :menu-class="nightMode ? 'bg-dark' : ''"
-        variant="transparent"
-      >
-        <template v-slot:button-content>
-          <icon name="arrow-switch" />
-        </template>
-
-        <b-dropdown-item
-          :to="`/board/${id}`"
-          :key="id"
-          v-for="{ name, id } in sortedBoards"
-          variant="transparent"
-          :active="board.id === id"
-        >
-          {{ name }}
-        </b-dropdown-item>
-
-        <b-dropdown-divider />
-        <b-dropdown-item-button>
-          <create-board />
-        </b-dropdown-item-button>
-      </b-dropdown>
-    </template>
+    <board-switcher />
 
     <div class="mt-auto">
       <b-button
@@ -104,12 +74,12 @@
       >
         <b-avatar
           v-if="user && user.photoURL"
-          variant="info"
-          small
-          :title="$t('navMenu.account')"
           v-b-tooltip.hover.right
-          :badge="notification"
+          small
+          variant="info"
           badge-variant="danger"
+          :title="$t('navMenu.account')"
+          :badge="notification"
           :src="user.photoURL"
         />
       </router-link>
@@ -119,24 +89,16 @@
 
 <script>
 import { mapState, mapGetters } from 'vuex';
-import CreateBoard from '@/components/Board/CreateBoard';
+import BoardSwitcher from '@/components/Board/BoardSwitcher';
 
 export default {
   components: {
-    CreateBoard,
+    BoardSwitcher,
   },
 
   computed: {
     ...mapState(['board', 'user', 'notification', 'settings']),
-    ...mapGetters(['sortedBoards', 'nightMode']),
-
-    routeName() {
-      return this.$route.name;
-    },
-
-    hasMultipleBoards() {
-      return this.$route.name === 'board' && this.board.name && this.sortedBoards.length > 1;
-    },
+    ...mapGetters(['nightMode']),
   },
 
   methods: {