diff --git a/css/style.css b/css/style.css
index 8d47ce0b5..95ec00b40 100644
--- a/css/style.css
+++ b/css/style.css
@@ -58,6 +58,9 @@ button.button-inline:hover {
 	display: flex !important;
 }
 
+.editable-inline {
+	cursor: text;
+}
 /**
  * Navigation sidebar
  */
@@ -248,20 +251,19 @@ button.button-inline:hover {
 	width: 100%;
 }
 
+.stack h2 span {
+	white-space: normal;
+	overflow: hidden;
+	text-overflow: ellipsis;
+}
+
 .stack h2 button {
 	margin-left: auto;
 	display: flex;
 	opacity: 0.25;
 }
 
-.stack h2 span {
-	white-space: normal;
-	overflow: hidden;
-	text-overflow: ellipsis;
-	cursor: text;
-}
-
-.stack h2:hover .stack-actions {
+.stack h2:hover button {
 	display: flex;
 }
 
diff --git a/templates/part.board.mainView.php b/templates/part.board.mainView.php
index 460605a3b..b9adbf129 100644
--- a/templates/part.board.mainView.php
+++ b/templates/part.board.mainView.php
@@ -35,12 +35,11 @@
 			 data-columnindex="{{$index}}" id="column{{$index}}"
 			 style="">
 			<h2 data-as-sortable-item-handle>
-				<span ng-show="!s.status.editStack" ng-click="s.status.editStack=true">{{ s.title }}</span>
+				<span class="editable-inline" ng-show="!s.status.editStack" ng-click="s.status.editStack=true">{{ s.title }}</span>
 				<form ng-if="s.status.editStack" ng-submit="stackservice.update(s)">
 					<input type="text" placeholder="Add a new stack"
 						   ng-blur="stackservice.update(s); s.status.editStack=false" ng-model="s.title"
-						   ng-if="s.status.editStack" autofocus-on-insert
-						   required maxlength="100"/>
+						   autofocus-on-insert required maxlength="100" />
 				</form>
 				<button class="icon-delete button-inline stack-actions"
 						ng-if="!s.status.editStack"