diff --git a/js/directive/contenteditable.js b/js/directive/contenteditable.js
index 8ea80dda8..b3d334120 100644
--- a/js/directive/contenteditable.js
+++ b/js/directive/contenteditable.js
@@ -22,10 +22,13 @@
 
 import app from '../app/App';
 
-app.directive("ngContenteditable", function($compile) {
+app.directive('ngContenteditable', function($compile) {
 	return {
-		require: "ngModel",
+		require: 'ngModel',
 		restrict: 'A',
+		scope: {
+			submit: '&ngSubmit'
+		},
 		link: function(scope, element, attrs, ngModel) {
 
 			//read the text typed in the div (syncing model with the view)
@@ -37,13 +40,20 @@ app.directive("ngContenteditable", function($compile) {
 			//$render is invoked when the modelvalue differs from the viewvalue
 			//see documentation: https://docs.angularjs.org/api/ng/type/ngModel.NgModelController#
 			ngModel.$render = function() {
-				element.html(ngModel.$viewValue || "");
+				element.html(ngModel.$viewValue || '');
 			};
 
 			//do this whenever someone starts typing
-			element.bind("blur keyup change", function() {
+			element.bind('blur keyup change', function(event) {
 				scope.$apply(read);
 			});
+
+			element.bind('keydown', function(event) {
+				if(event.which == '13' && event.shiftKey) {
+					scope.submit();
+				}
+			});
+
 		}
 	};
 });
diff --git a/templates/part.card.activity.html b/templates/part.card.activity.html
index 065e83d5d..d4c1fafc2 100644
--- a/templates/part.card.activity.html
+++ b/templates/part.card.activity.html
@@ -4,10 +4,10 @@
 			<div class="avatardiv" avatar ng-attr-user="{{ $ctrl.currentUser.uid }}" ng-attr-displayname="{{ $ctrl.currentUser.displayName }}" ng-attr-size="24"></div>
 			<div class="author currentUser">{{ $ctrl.currentUser.displayName }}</div>
 		</div>
-		<form class="newCommentForm">
-			<div ng-contenteditable contenteditable="true" class="message" data-placeholder="{{ $ctrl.t('New comment …') }}" ng-model="$ctrl.$scope.newComment" ng-disabled="$ctrl.status.commentCreateLoading"></div>
+		<form class="newCommentForm" ng-submit="$ctrl.postComment()">
+			<div ng-contenteditable contenteditable="true" class="message" ng-submit="$ctrl.postComment()" data-placeholder="{{ $ctrl.t('New comment …') }}" ng-model="$ctrl.$scope.newComment" ng-disabled="$ctrl.status.commentCreateLoading"></div>
 			<input class="submit icon-confirm has-tooltip" type="submit"
-				   value="" title="" data-original-title="Post" ng-click="$ctrl.postComment()" ng-if="!$ctrl.status.commentCreateLoading">
+				   value="" title="" data-original-title="Post" ng-if="!$ctrl.status.commentCreateLoading">
 			<div class="submitLoading icon-loading-small" ng-if="$ctrl.status.commentCreateLoading"></div>
 		</form>
 	</div>