diff --git a/CHANGELOG b/CHANGELOG
index 235a99b43270fb8c1491c8d733e39eddceed0932..5af8ccd90fb3c6d169ae4287df38d22d9e5c4dda 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -35,7 +35,7 @@ v 7.8.0
   - 
   - Add a commit calendar to the user profile (Hannes Rosenögger)  
   - 
-  - 
+  - Submit comment on command-enter
   - 
   - Fix long broadcast message cut-off on left sidebar (Visay Keo)
   - Add Project Avatars (Steven Thonus and Hannes Rosenögger)
diff --git a/app/assets/javascripts/notes.js.coffee b/app/assets/javascripts/notes.js.coffee
index ac1353b8bb62f608603d4ce462c5b88619bc9fbc..15597060c6b4cd26be0a6027fcd00b1ac1d5803a 100644
--- a/app/assets/javascripts/notes.js.coffee
+++ b/app/assets/javascripts/notes.js.coffee
@@ -59,7 +59,7 @@ class @Notes
 
     @notes_forms = '.js-main-target-form textarea, .js-discussion-note-form textarea'
     $(document).on('keypress', @notes_forms, (e)->
-      if e.keyCode == 10 || (e.ctrlKey && e.keyCode == 13)
+      if e.keyCode == 10 || ((e.metaKey || e.ctrlKey) && e.keyCode == 13)
         $(@).parents('form').submit()
     )