diff --git a/js/controller/BoardController.js b/js/controller/BoardController.js
index 12d32d281..2e3653ad0 100644
--- a/js/controller/BoardController.js
+++ b/js/controller/BoardController.js
@@ -42,6 +42,38 @@ app.controller('BoardController', function ($rootScope, $scope, $stateParams, St
 	$scope.board = BoardService.getCurrent();
 	$scope.uploader = FileService.uploader;
 
+	$scope.startTitleEdit = function(card) {
+		card.renameTitle = card.title;
+		card.status = card.status || {};
+		card.status.editCard = true;
+	};
+
+	$scope.finishTitleEdit = function(card) {
+		var newTitle;
+		if (!card.renameTitle || !card.renameTitle.trim()) {
+			newTitle = '';
+		} else {
+			newTitle = card.renameTitle.trim();
+		}
+
+		if (newTitle === card.title) {
+			// title unchanged
+			card.status.editCard = false;
+			delete card.renameTitle;
+		} else if (newTitle !== '') {
+			// title changed
+			card.title = newTitle;
+			CardService.update(card).then(function (data) {
+				card.status.editCard = false;
+				delete card.renameTitle;
+			});
+		} else {
+			// empty title
+			card.status.editCard = false;
+			delete card.renameTitle;
+		}
+	};
+
 	$scope.$watch(function() {
 		return $state.current;
 	}, function(currentState) {
diff --git a/templates/part.board.mainView.php b/templates/part.board.mainView.php
index d09bcdac0..fb91b9a01 100644
--- a/templates/part.board.mainView.php
+++ b/templates/part.board.mainView.php
@@ -73,12 +73,16 @@
 							<h4>
 								<span class="editable-inline"
 									ng-show="!c.status.editCard"
-									ng-click="c.status.editCard=true">{{cardservice.get(c.id).title}}</span>
-
-								<form ng-if="c.status.editCard" ng-submit="cardservice.update(c); c.status.editCard=false">
-									<input class="input-inline" type="text" placeholder="<?php p($l->t('Add a new card')); ?>"
-										ng-blur="cardservice.update(c); c.status.editCard=false" ng-model="c.title"
-										autofocus-on-insert required maxlength="100" />
+									ng-click="startTitleEdit(c)">{{cardservice.get(c.id).title}}</span>
+								<form ng-if="c.status.editCard" ng-submit="finishTitleEdit(c)">
+									<input
+											class="input-inline"
+											type="text"
+											ng-blur="finishTitleEdit(c)"
+											ng-model="c.renameTitle"
+											autofocus-on-insert
+											required
+											maxlength="100">
 								</form>
 							</h4>
 							<ul class="labels compact-item" ng-if="!compactMode">