diff --git a/css/style.css b/css/style.css
index 516a8401d..1df8d76e9 100644
--- a/css/style.css
+++ b/css/style.css
@@ -254,10 +254,14 @@ button:hover {
 	font-size: 12pt;
 	font-weight: 700;
 	border: 0;
-	background-color: transparent;
+	background-color: white;
 	min-height: initial;
 }
 
+.stack form {
+	width: 100%;
+}
+
 .stack h2 button,
 .stack .stack-actions {
 	float: right;
@@ -267,6 +271,8 @@ button:hover {
 .stack h2 span {
 	width: 100%;
 	white-space: normal;
+	overflow: hidden;
+	text-overflow: ellipsis;
 }
 
 .stack h2 .stack-actions {
diff --git a/templates/part.board.mainView.php b/templates/part.board.mainView.php
index 3a0ca2a53..e1305556a 100644
--- a/templates/part.board.mainView.php
+++ b/templates/part.board.mainView.php
@@ -47,16 +47,14 @@
 			 data-columnindex="{{$index}}" id="column{{$index}}"
 			 style="">
 			<h2><span ng-show="!s.status.editStack">{{ s.title }}</span>
-				<form ng-submit="stackservice.update(s)">
+				<form ng-if="s.status.editStack" ng-submit="stackservice.update(s)">
 					<input type="text" placeholder="Add a new stack"
-						   ng-blur="s.status.editStack=false" ng-model="s.title"
+						   ng-blur="stackservice.update(s); s.status.editStack=false" ng-model="s.title"
 						   ng-if="s.status.editStack" autofocus-on-insert
 						   required maxlength="100"/>
 				</form>
-				<div class="stack-actions">
-					<button class="icon icon-confirm" ng-if="s.status.editStack"
-							type="submit"></button>
-					<button class="icon-rename" ng-if="!s.status.editStack"
+				<div ng-if="!s.status.editStack" class="stack-actions">
+					<button class="icon-rename"
 							ng-click="s.status.editStack=true"></button>
 					<button class="icon-delete"
 							ng-click="stackservice.delete(s.id)"></button>