diff --git a/client/commonFramework/create-editor.js b/client/commonFramework/create-editor.js
index 7990fb9c4f..09efed144b 100644
--- a/client/commonFramework/create-editor.js
+++ b/client/commonFramework/create-editor.js
@@ -68,6 +68,12 @@ window.common = (function(global) {
     'Cmd-Enter': function() {
       common.editorExecute$.onNext();
       return false;
+    },
+    'Ctrl-/': function(cm) {
+      cm.toggleComment();
+    },
+    'Cmd-/': function(cm) {
+      cm.toggleComment();
     }
   });
 
diff --git a/gulpfile.js b/gulpfile.js
index 86d1afc098..2426e34a88 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -81,6 +81,7 @@ var paths = {
     'public/bower_components/jshint/dist/jshint.js',
     'public/bower_components/chai/chai.js',
     'public/bower_components/CodeMirror/lib/codemirror.js',
+    'public/bower_components/CodeMirror/addon/comment/comment.js',
     'public/bower_components/CodeMirror/addon/edit/closebrackets.js',
     'public/bower_components/CodeMirror/addon/edit/matchbrackets.js',
     'public/bower_components/CodeMirror/addon/lint/lint.js',