diff --git a/js/views/BoardSelector.vue b/js/views/BoardSelector.vue
index a34790559..280259f44 100644
--- a/js/views/BoardSelector.vue
+++ b/js/views/BoardSelector.vue
@@ -25,7 +25,7 @@
 		<div id="modal-inner" :class="{ 'icon-loading': loading }">
 			<h1>{{ t('deck', 'Select the board to link to a project') }}</h1>
 			<ul v-if="!loading">
-				<li v-for="board in boards" v-if="currentBoard && ''+board.id !== ''+currentBoard" @click="selectedBoard=board.id" :class="{'selected': (selectedBoard === board.id) }">
+				<li v-for="board in boards" v-if="!currentBoard || ''+board.id !== ''+currentBoard" @click="selectedBoard=board.id" :class="{'selected': (selectedBoard === board.id) }">
 					<span class="board-bullet" :style="{ 'backgroundColor': '#' + board.color }"></span>
 					<span>{{ board.title }}</span>
 				</li>
@@ -89,8 +89,10 @@
 		},
 		beforeMount() {
 			this.fetchBoards();
-			if (angular.element('#board')) {
-				this.currentBoard = angular.element('#board').scope().boardservice.id || null;
+			if (typeof angular !== 'undefined' && angular.element('#board')) {
+				try {
+					this.currentBoard = angular.element('#board').scope().boardservice.id || null;
+				} catch (e) {}
 			}
 		},
 		methods: {