diff --git a/css/style.css b/css/style.css
index 6fc041834..fdfd62871 100644
--- a/css/style.css
+++ b/css/style.css
@@ -40,16 +40,6 @@
 	height: auto;
 }
 
-#app-navigation .active,
-#app-navigation .active a,
-#app-navigation li:hover > a,
-#app-navigation li:focus > a,
-#app-navigation a:focus,
-#app-navigation .selected,
-#app-navigation .selected a {
-	background-color: #fafafa;
-}
-
 #app-navigation .board-bullet {
 	position: absolute;
 	margin-left: 17px;
@@ -65,7 +55,7 @@
 	position: relative;
 	height: 100%;
 	white-space: nowrap;
-	overflow: none;
+	overflow: hidden;
 	padding: 0;
 	z-index: 100;
 	width: 100%;
@@ -648,7 +638,6 @@ input.input-inline {
 	margin-top: -4px;
 	line-height: 100%;
 	margin-bottom: -4px;
-
 }
 
 button {
diff --git a/templates/part.navigation.php b/templates/part.navigation.php
index 306adf3f2..6906e5db4 100644
--- a/templates/part.navigation.php
+++ b/templates/part.navigation.php
@@ -2,7 +2,7 @@
 
 	<li><a href="#" class=""><?php p($l->t('All Boards')); ?></a></li>
 
-	<li class="with-icon with-menu" data-ng-repeat="b in boardservice.sorted">
+	<li class="with-icon with-menu" ng-class="{active: b.id === boardservice.getCurrent().id}" data-ng-repeat="b in boardservice.sorted">
 		<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;">