diff --git a/common/app/routes/challenges/components/classic/Editor.jsx b/common/app/routes/challenges/components/classic/Editor.jsx
index d7256579bd6..ba8f7ed8716 100644
--- a/common/app/routes/challenges/components/classic/Editor.jsx
+++ b/common/app/routes/challenges/components/classic/Editor.jsx
@@ -77,6 +77,12 @@ export class Editor extends PureComponent {
         'Cmd-Enter': function() {
           executeChallenge();
           return false;
+        },
+        'Ctrl-/': function(cm) {
+          cm.toggleComment();
+        },
+        'Cmd-/': function(cm) {
+          cm.toggleComment();
         }
       }
     })