1 files changed, 11 insertions, 0 deletions

diff --git a/js/controllers/code-editor-controller.js b/js/controllers/code-editor-controller.js
index 4a08aa32..7913cfc1 100644
--- a/js/controllers/code-editor-controller.js
+++ b/js/controllers/code-editor-controller.js
@@ -110,6 +110,17 @@ var CodeEditorController = exports.CodeEditorController = Montage.create(Compone
     _codeCompletionKeyEventHandler:{
         enumerable:false,
         value: function(cm, keyEvent, documentType) {
+            //comment shortkeys
+            if((keyEvent.metaKey || keyEvent.ctrlKey) && !keyEvent.shiftKey && keyEvent.keyCode === 191){//ctrl+/
+                this.commentSelection(true);
+                return;
+            }
+            //uncomment shortkeys
+            if((keyEvent.metaKey || keyEvent.ctrlKey) && keyEvent.shiftKey && keyEvent.keyCode === 191){//ctrl+shift+/
+                this.commentSelection(false);
+                return;
+            }
+
             //===manually triggered code completion
             if((this.automaticCodeComplete === false)){
                 if(keyEvent.ctrlKey && keyEvent.keyCode === 32){//Ctrl+Space