diff --git a/common/content/commandline.js b/common/content/commandline.js
index a45927d5..a029695e 100644
--- a/common/content/commandline.js
+++ b/common/content/commandline.js
@@ -837,13 +837,13 @@ const CommandLine = Module("commandline", {
                     commandline.triggerCallback("submit", mode, command);
                 }
                 // user pressed <Up> or <Down> arrow to cycle history completion
-                else if (/^<(Up|Down|S-Up|S-Down|PageUp|PageDown)>$/.test(key)) {
+                else if (/^<(Up|Down|S-Up|S-Down)>$/.test(key)) {
                     // prevent tab from moving to the next field
                     event.preventDefault();
                     event.stopPropagation();
 
                     dactyl.assert(this._history);
-                    this._history.select(/Up/.test(key), !/(Page|S-)/.test(key));
+                    this._history.select(/Up/.test(key), !/S-/.test(key));
                 }
                 // user pressed <Tab> to get completions of a command
                 else if (/^<(?:A-)?(?:S-)?Tab>$/.test(key)) {
@@ -1686,6 +1686,14 @@ const CommandLine = Module("commandline", {
                 dactyl.assert(commandline._lastMowOutput, "No previous command output");
                 commandline._echoMultiline(commandline._lastMowOutput, commandline.HL_NORMAL);
             });
+
+        mappings.add(myModes,
+            ["<C-p>", "<PageUp>"], "Recall the previous command line from the history list",
+            function () { events.feedkeys("<S-Up>"); });
+
+        mappings.add(myModes,
+            ["<C-n>", "<PageDown>"], "Recall the next command line from the history list",
+            function () { events.feedkeys("<S-Down>"); });
     },
     options: function () {
         options.add(["history", "hi"],
diff --git a/common/locale/en-US/cmdline.xml b/common/locale/en-US/cmdline.xml
index b7f03732..cdb56940 100644
--- a/common/locale/en-US/cmdline.xml
+++ b/common/locale/en-US/cmdline.xml
@@ -97,7 +97,7 @@
 </item>
 
 <item>
-    <tags><![CDATA[c_<S-Up> c_<PageUp>]]></tags>
+    <tags><![CDATA[c_<C-p> c_<S-Up> c_<PageUp>]]></tags>
     <spec>&lt;S-Up></spec>
     <strut/>
     <spec>&lt;PageUp></spec>
@@ -107,7 +107,7 @@
 </item>
 
 <item>
-    <tags><![CDATA[c_<S-Down> c_<PageDown>]]></tags>
+    <tags><![CDATA[c_<C-n> c_<S-Down> c_<PageDown>]]></tags>
     <spec>&lt;S-Down></spec>
     <spec>&lt;PageDown></spec>
     <description>
diff --git a/pentadactyl/TODO b/pentadactyl/TODO
index 9d41d5d3..786421ae 100644
--- a/pentadactyl/TODO
+++ b/pentadactyl/TODO
@@ -56,7 +56,7 @@ FEATURES:
 7 make an option to disable session saving by default when you close Firefox
 7 The output of the pageinfo-command should contain the security-information of ssl-encrypted sites
 7 :grep support (needs location list)
-7 map <C-n/p> and/or <A-n/p> in command-line mode to something useful (such as Down/Up)
+7 map <A-n/p> in command-line mode to something useful (such as Down/Up)
 6 :mksession
 6 add [count] support to :b* and :tab* commands where missing
 6 check/correct spellings in insert mode with some mappings