diff --git a/lib/Service/BoardService.php b/lib/Service/BoardService.php
index 3c07025b9..9e3f9948f 100644
--- a/lib/Service/BoardService.php
+++ b/lib/Service/BoardService.php
@@ -157,6 +157,13 @@ class BoardService {
 		}
 		$new_board->setLabels($labels);
 		$this->boardMapper->mapOwner($new_board);
+		$permissions = $this->permissionService->matchPermissions($new_board);
+		$new_board->setPermissions([
+			'PERMISSION_READ' => $permissions[Acl::PERMISSION_READ],
+			'PERMISSION_EDIT' => $permissions[Acl::PERMISSION_EDIT],
+			'PERMISSION_MANAGE' => $permissions[Acl::PERMISSION_MANAGE],
+			'PERMISSION_SHARE' => $permissions[Acl::PERMISSION_SHARE]
+		]);
 		return $new_board;
 
 	}
diff --git a/templates/part.boardlist.php b/templates/part.boardlist.php
index 2e9707c9b..2f3df25df 100644
--- a/templates/part.boardlist.php
+++ b/templates/part.boardlist.php
@@ -46,8 +46,8 @@
 						</ul>
 					</div>
 				</div>
-				<div class="app-popover-menu-utils" ng-if="b.archived && b.deletedAt > 0">
-					<button class="icon icon-history" ng-click="boardDeleteUndo(b)" title="Undo board deletion - Otherwise the board will be deleted during the next cronjob run."></button>
+				<div class="app-popover-menu-utils" ng-if="b.deletedAt > 0">
+					<button class="icon icon-history button-inline" ng-click="boardDeleteUndo(b)" title="Undo board deletion - Otherwise the board will be deleted during the next cronjob run."></button>
 				</div>
 			</td>
 		</tr>
diff --git a/templates/part.navigation.php b/templates/part.navigation.php
index 57aea3366..fe691e223 100644
--- a/templates/part.navigation.php
+++ b/templates/part.navigation.php
@@ -4,7 +4,7 @@
 	<li ng-class="{active: status.filter === 'archived' || (boardservice.getCurrent() && boardservice.getCurrent().archived)}"><a ui-sref="list({ filter: 'archived' })" class="icon-archive"><?php p($l->t('Archived boards')); ?></a></li>
 	<li ng-class="{active: status.filter === 'shared'}"><a ui-sref="list({ filter: 'shared' })" class="icon-share"><?php p($l->t('Shared boards')); ?></a></li>
 
-	<li class="with-icon with-menu" ng-class="{active: b.id === boardservice.getCurrent().id}" data-ng-repeat="b in boardservice.sidebar">
+	<li class="with-icon with-menu" ng-class="{active: b.id === boardservice.getCurrent().id}" data-ng-repeat="b in boardservice.sidebar" ng-if="b.deletedAt == 0">
 		<span class="board-bullet"  style="background-color:#{{b.color}};" ng-if="!b.status.edit"> </span>
 		<a href="#!/board/{{b.id}}/" ng-if="!b.status.edit">{{ b.title }}</a>
 		<div class="app-navigation-entry-utils" ng-show="!b.status.edit" style="position:absolute;">