diff --git a/IPython/html/templates/notebook.html b/IPython/html/templates/notebook.html
index a23bc1a..06c699b 100644
--- a/IPython/html/templates/notebook.html
+++ b/IPython/html/templates/notebook.html
@@ -198,6 +198,7 @@ class="notebook_app"
                 <li><a href="http://ipython.org/documentation.html" target="_blank">IPython Help</a></li>
                 <li><a href="http://ipython.org/ipython-doc/stable/interactive/notebook.html" target="_blank">Notebook Help</a></li>
                 <li id="keyboard_shortcuts" title="Opens a tooltip with all keyboard shortcuts"><a href="#">Keyboard Shortcuts</a></li>
+                <li><a href="http://ipython.org/ipython-doc/dev/interactive/cm_keyboard.html" target="_blank">Editor Shortcuts</a></li>
                 <li class="divider"></li>
                 <li><a href="http://docs.python.org" target="_blank">Python</a></li>
                 <li><a href="http://docs.scipy.org/doc/numpy/reference/" target="_blank">NumPy</a></li>
diff --git a/docs/source/interactive/cm_keyboard.rst b/docs/source/interactive/cm_keyboard.rst
new file mode 100644
index 0000000..b8c20f3
--- /dev/null
+++ b/docs/source/interactive/cm_keyboard.rst
@@ -0,0 +1,42 @@
+.. _cm_keyboard:
+
+Some additional Codemirror keyboard shortcuts
+=============================================
+
+Because each cell of the IPython notebook is powered by Codemirror,
+you can actually use a set of predetermined keyboard shortcuts to
+write and manipulate your content easily:
+
+=================  ==============  ==================
+Action             PC shortcut     Mac shortcut      
+=================  ==============  ==================
+newline & indent   Enter           Enter             
+toggle overwrite   Insert          Insert            
+indent             Ctrl-]          Cmd-]             
+dedent             Ctrl-[          Cmd-[             
+select all         Ctrl-A          Cmd-A             
+delete line        Ctrl-D          Cmd-D             
+undo               Ctrl-Z          Cmd-Z             
+redo               Ctrl-Shift-Z    Cmd-Shift-Z       
+redo               Ctrl-Y          Cmd-Y             
+go to cell start   Ctrl-Home       Cmd-Up            
+go to cell start   Alt-Up          Cmd-End           
+go to cell start   PageUp          PageUp            
+go to cell end     Ctrl-End        ---               
+go to cell end     Ctrl-Down       Cmd-Down          
+go to cell end     PageDown        PageDown          
+go one word left   Ctrl-Left       Alt-Left          
+go one word right  Ctrl-Right      Alt-Right         
+go to line start   Alt-Left        Cmd-Left          
+go to line start   Home            Home              
+go to line end     Alt-Right       Cmd-Right         
+go to line end     End             End               
+del word before    Ctrl-Backspace  Alt-Backspace     
+del word after     ---             Ctrl-Alt-Backspace
+del word after     Ctrl-Delete     Alt-Delete        
+=================  ==============  ==================
+
+.. note::
+
+     These shorcuts are valid for US keyboards, so some shortcuts can change
+     for non-US keyboards.
\ No newline at end of file
diff --git a/docs/source/interactive/index.rst b/docs/source/interactive/index.rst
index 1fb9f7f..fd24a05 100644
--- a/docs/source/interactive/index.rst
+++ b/docs/source/interactive/index.rst
@@ -11,6 +11,7 @@ Using IPython for interactive work
    shell
    qtconsole
    notebook
+   cm_keyboard
    nbconvert
    public_server
 
diff --git a/docs/source/interactive/notebook.rst b/docs/source/interactive/notebook.rst
index 8e18de7..29eb711 100644
--- a/docs/source/interactive/notebook.rst
+++ b/docs/source/interactive/notebook.rst
@@ -394,7 +394,9 @@ Ctrl-m .       restart kernel
 Ctrl-m h       show keyboard shortcuts
 ============  ==========================
 
-   
+.. seealso::
+
+    :ref:`Some additional Codemirror keyboard shortcuts <cm_keyboard>`