diff --git a/IPython/html/static/notebook/js/keyboardmanager.js b/IPython/html/static/notebook/js/keyboardmanager.js
index 04d1091..73e5198 100644
--- a/IPython/html/static/notebook/js/keyboardmanager.js
+++ b/IPython/html/static/notebook/js/keyboardmanager.js
@@ -107,12 +107,16 @@ var IPython = (function (IPython) {
                         IPython.notebook.command_mode();
                         IPython.notebook.select_prev();
                         IPython.notebook.edit_mode();
+                        var cm = IPython.notebook.get_selected_cell().code_mirror;
+                        var prev_cursor = cell.code_mirror.getCursor();
+                        cm.setCursor(cm.lastLine(), prev_cursor.ch)
                         return false;
                     } else if (cell) {
                         var cm = cell.code_mirror;
                         var cursor = cm.getCursor();
                         cursor.line -= 1;
                         cm.setCursor(cursor);
+                        return false;
                     }
                 }
             }
@@ -129,12 +133,16 @@ var IPython = (function (IPython) {
                         IPython.notebook.command_mode();
                         IPython.notebook.select_next();
                         IPython.notebook.edit_mode();
+                        var cm = IPython.notebook.get_selected_cell().code_mirror;
+                        var prev_cursor = cell.code_mirror.getCursor();
+                        cm.setCursor(0, prev_cursor.ch);
                         return false;
                     } else if (cell) {
                         var cm = cell.code_mirror;
                         var cursor = cm.getCursor();
                         cursor.line += 1;
                         cm.setCursor(cursor);
+                        return false;
                     }
                 }
             }