diff --git a/IPython/html/static/notebook/js/codecell.js b/IPython/html/static/notebook/js/codecell.js
index a7bc26a..38a0913 100644
--- a/IPython/html/static/notebook/js/codecell.js
+++ b/IPython/html/static/notebook/js/codecell.js
@@ -85,7 +85,13 @@ var IPython = (function (IPython) {
 
     CodeCell.options_default = {
         cm_config : {
-            extraKeys: {"Tab": "indentMore","Shift-Tab" : "indentLess",'Backspace':"delSpaceToPrevTabStop"},
+            extraKeys: {
+                "Tab" :  "indentMore",
+                "Shift-Tab" : "indentLess",
+                "Backspace" : "delSpaceToPrevTabStop",
+                "Cmd-/" : "toggleComment",
+                "Ctrl-/" : "toggleComment"
+            },
             mode: 'ipython',
             theme: 'ipython',
             matchBrackets: true
diff --git a/IPython/html/templates/notebook.html b/IPython/html/templates/notebook.html
index b52bae9..2789c2b 100644
--- a/IPython/html/templates/notebook.html
+++ b/IPython/html/templates/notebook.html
@@ -211,6 +211,7 @@ class="notebook_app"
 <script src="{{ static_url("components/codemirror/addon/mode/multiplex.js") }}" charset="utf-8"></script>
 <script src="{{ static_url("components/codemirror/addon/mode/overlay.js") }}" charset="utf-8"></script>
 <script src="{{ static_url("components/codemirror/addon/edit/matchbrackets.js") }}" charset="utf-8"></script>
+<script src="{{ static_url("components/codemirror/addon/comment/comment.js") }}" charset="utf-8"></script>
 <script src="{{ static_url("notebook/js/codemirror-ipython.js") }}" charset="utf-8"></script>
 <script src="{{ static_url("components/codemirror/mode/htmlmixed/htmlmixed.js") }}" charset="utf-8"></script>
 <script src="{{ static_url("components/codemirror/mode/xml/xml.js") }}" charset="utf-8"></script>