diff --git a/src/components/Controls.vue b/src/components/Controls.vue
index e8fb84b9d..bcfbdba49 100644
--- a/src/components/Controls.vue
+++ b/src/components/Controls.vue
@@ -33,14 +33,14 @@
 				({{ t('deck', 'Archived cards') }})
 			</p>
 		</div>
-		<div v-if="board" class="board-actions">
+		<div class="board-actions">
 			<div v-if="searchQuery || true" class="deck-search">
 				<input type="search"
 					class="icon-search"
 					:value="searchQuery"
 					@input="$store.commit('setSearchQuery', $event.target.value)">
 			</div>
-			<div v-if="canManage && !showArchived && !board.archived"
+			<div v-if="board && canManage && !showArchived && !board.archived"
 				id="stack-add"
 				v-click-outside="hideAddStack">
 				<Actions v-if="!isAddStackVisible">
@@ -63,7 +63,7 @@
 						value="">
 				</form>
 			</div>
-			<div class="board-action-buttons">
+			<div v-if="board" class="board-action-buttons">
 				<Popover @show="filterVisible=true" @hide="filterVisible=false">
 					<Actions slot="trigger" :title="t('deck', 'Apply filter')">
 						<ActionButton v-if="isFilterActive" icon="icon-filter_set" />
diff --git a/src/components/overview/Overview.vue b/src/components/overview/Overview.vue
index a661a562b..aad07cfb2 100644
--- a/src/components/overview/Overview.vue
+++ b/src/components/overview/Overview.vue
@@ -207,6 +207,8 @@ export default {
 	width: 100%;
 	height: 100%;
 	max-height: calc(100vh - 50px);
+	display: flex;
+	flex-direction: column;
 }
 
 .overview {