diff --git a/common/content/buffer.js b/common/content/buffer.js
index 0bd9e7e2..e073e317 100644
--- a/common/content/buffer.js
+++ b/common/content/buffer.js
@@ -1662,12 +1662,12 @@ var Buffer = Module("buffer", {
             "Scroll to the absolute right of the document",
             function () { buffer.scrollToPercent(100, null); });
 
-        mappings.add([modes.COMMAND], ["gg", "<Home>"],
+        mappings.add([modes.COMMAND], ["gg", "<Home>", "<scroll-top>"],
             "Go to the top of the document",
             function (args) { buffer.scrollToPercent(null, args.count != null ? args.count : 0); },
             { count: true });
 
-        mappings.add([modes.COMMAND], ["G", "<End>"],
+        mappings.add([modes.COMMAND], ["G", "<End>", "<scroll-bottom>"],
             "Go to the end of the document",
             function (args) { buffer.scrollToPercent(null, args.count != null ? args.count : 100); },
             { count: true });
diff --git a/common/locale/en-US/buffer.xml b/common/locale/en-US/buffer.xml
index 66d0d978..d6725bd1 100644
--- a/common/locale/en-US/buffer.xml
+++ b/common/locale/en-US/buffer.xml
@@ -115,7 +115,7 @@
 </item>
 
 <item>
-    <tags><![CDATA[<Home> gg]]></tags>
+    <tags><![CDATA[<scroll-top> <Home> gg]]></tags>
     <strut/>
     <spec><oa>count</oa>gg</spec>
     <description>
@@ -128,7 +128,7 @@
 </item>
 
 <item>
-    <tags><![CDATA[<End> G]]></tags>
+    <tags><![CDATA[<scroll-bottom> <End> G]]></tags>
     <strut/>
     <spec><oa>count</oa>G</spec>
     <description>