diff --git a/js/controller/CardController.js b/js/controller/CardController.js
index f4815f517..4556b5b08 100644
--- a/js/controller/CardController.js
+++ b/js/controller/CardController.js
@@ -58,6 +58,7 @@ app.controller('CardController', function ($scope, $rootScope, $routeParams, $lo
 			return false;
 		}
 		$scope.status.cardEditDescription = true;
+		$scope.status.edit = angular.copy(CardService.getCurrent());
 		return true;
 	};
 	$scope.cardEditDescriptionChanged = function ($event) {
@@ -73,7 +74,7 @@ app.controller('CardController', function ($scope, $rootScope, $routeParams, $lo
 			$scope.status.lastSave = currentTime;
 			var header = $('.section-header.card-description');
 			header.find('.save-indicator.unsaved').fadeIn(500);
-			CardService.update(CardService.getCurrent()).then(function (data) {
+			CardService.update($scope.status.edit).then(function (data) {
 				var header = $('.section-header.card-description');
 				header.find('.save-indicator.unsaved').hide();
 				header.find('.save-indicator.saved').fadeIn(250).fadeOut(1000);
@@ -89,7 +90,7 @@ app.controller('CardController', function ($scope, $rootScope, $routeParams, $lo
 		});
 	};
 	$scope.cardUpdate = function (card) {
-		CardService.update(CardService.getCurrent()).then(function (data) {
+		CardService.update(card).then(function (data) {
 			$scope.status.cardEditDescription = false;
 			var header = $('.section-content.card-description');
 			header.find('.save-indicator.unsaved').hide();
diff --git a/templates/part.card.php b/templates/part.card.php
index 9931c1248..eaf9258be 100644
--- a/templates/part.card.php
+++ b/templates/part.card.php
@@ -98,8 +98,8 @@
 	<div class="section-content card-description">
 		<textarea elastic ng-if="status.cardEditDescription"
 				  placeholder="<?php p($l->t('Add a card description…')); ?>"
-				  ng-blur="cardUpdate(cardservice.getCurrent())"
-				  ng-model="cardservice.getCurrent().description"
+				  ng-blur="cardUpdate(status.edit)"
+				  ng-model="status.edit.description"
 				  ng-change="cardEditDescriptionChanged()"
 				  autofocus-on-insert> </textarea>
 		<div class="container" ng-click="cardEditDescriptionShow($event)"