diff --git a/view/theme/frio/js/textedit.js b/view/theme/frio/js/textedit.js
index 73b7b084f9..3a384bbb23 100644
--- a/view/theme/frio/js/textedit.js
+++ b/view/theme/frio/js/textedit.js
@@ -106,11 +106,6 @@ function commentExpand(id) {
 	closeMenu("comment-fake-form-" + id);
 	openMenu("item-comments-" + id);
 	$("#comment-edit-text-" + id)
-		.keydown(function (e) {
-				if ((e.ctrlKey || e.metaKey) && (e.keyCode == 13 || e.keyCode == 10)) {
-					$("#comment-edit-submit-" + id).trigger('click');
-				}
-			})
 		.putCursorAtEnd()
 		.addClass("comment-edit-text-full")
 		.removeClass("comment-edit-text-empty");
diff --git a/view/theme/frio/templates/comment_item.tpl b/view/theme/frio/templates/comment_item.tpl
index c81d259b40..5e90589c6d 100644
--- a/view/theme/frio/templates/comment_item.tpl
+++ b/view/theme/frio/templates/comment_item.tpl
@@ -46,7 +46,7 @@
 			</p>
 			<div id="dropzone-{{$id}}" class="dropzone">
 				<p>
-					<textarea id="comment-edit-text-{{$id}}" class="dropzone comment-edit-text-empty form-control text-autosize" name="body" placeholder="{{$comment}}" rows="3" data-default="{{$default}}" dir="auto">{{$default}}</textarea>
+					<textarea id="comment-edit-text-{{$id}}" class="dropzone comment-edit-text-empty form-control text-autosize" name="body" placeholder="{{$comment}}" rows="3" data-default="{{$default}}" dir="auto" onkeydown="sendOnCtrlEnter(event, 'comment-edit-submit-{{$id}}')">{{$default}}</textarea>
 				</p>
 			</div>
 	{{if $qcomment}}