diff --git a/css/style.css b/css/style.css
index eb7ef473c..10eef6301 100644
--- a/css/style.css
+++ b/css/style.css
@@ -80,6 +80,14 @@ button.button-inline:hover {
 	height: auto;
 }
 
+#app-navigation .app-navigation-entry-edit .colorselect div{
+	height: 32px;
+}
+
+#app-navigation .app-navigation-entry-edit form {
+	display: flex;
+}
+
 #app-navigation .board-bullet {
 	position: absolute;
 	margin-left: 17px;
@@ -678,7 +686,6 @@ button.button-inline:hover {
 	border-radius:3px;
 	flex-direction: row;
 	display: flex;
-	margin: 0px 0px 0px 3px;
 }
 
 .colorselect .color {
@@ -715,6 +722,10 @@ button.button-inline:hover {
 	width: 100%;
 }
 
+.labels .label-edit .colorselect{
+	margin: 0px 0px 0px 3px;
+}
+
 .labels .label-edit input {
 	border-bottom: 1px solid #333333;
 	padding: 5px 5px 4px 5px !important;
@@ -787,6 +798,10 @@ button.button-inline:hover {
 	flex-grow: 1;
 }
 
+#boardlist td .colorselect div {
+	min-width: 32px;
+}
+
 #boardlist td input[type=text] {
 	flex-grow: 2;
 }
diff --git a/templates/part.navigation.php b/templates/part.navigation.php
index fe691e223..d610d011b 100644
--- a/templates/part.navigation.php
+++ b/templates/part.navigation.php
@@ -23,10 +23,10 @@
 			<form ng-disabled="isAddingList" class="ng-pristine ng-valid"  ng-submit="boardUpdate(b)">
 				<input id="newTitle" class="edit ng-valid ng-empty" type="text" autofocus-on-insert ng-model="b.title" maxlength="100">
 				<input type="submit" value="" class="action icon-checkmark svg">
-				<div class="colorselect">
-					<div class="color" ng-repeat="c in colors" style="background-color:#{{ c }};" ng-click="b.color=c" ng-class="{'selected': (c == b.color) }"><br /></div>
-				</div>
 			</form>
+			<div class="colorselect">
+				<div class="color" ng-repeat="c in colors" style="background-color:#{{ c }};" ng-click="b.color=c" ng-class="{'selected': (c == b.color) }"></div>
+			</div>
 		</div>
 	</li>