diff -ru orig/chrome/browser/content/browser/browser.js patched/chrome/browser/content/browser/browser.js
--- orig/chrome/browser/content/browser/browser.js	2010-01-01 00:00:00.000000000 -0800
+++ patched/chrome/browser/content/browser/browser.js	2012-03-25 11:05:53.238631211 -0700
@@ -9100,6 +9100,11 @@
 
   let mayInheritPrincipal = { value: false };
   let url = getShortcutOrURI(clipboard, mayInheritPrincipal);
+  var URIFixup = Components.classes["@mozilla.org/docshell/urifixup;1"]
+                           .getService(Components.interfaces.nsIURIFixup);
+  url = URIFixup.createFixupURI(url, 1).spec;
+  // 1 is FIXUP_FLAG_ALLOW_KEYWORD_LOOKUP
+
   try {
     makeURI(url);
   } catch (ex) {
diff -ru orig/chrome/browser/content/browser/browser.xul patched/chrome/browser/content/browser/browser.xul
--- orig/chrome/browser/content/browser/browser.xul	2010-01-01 00:00:00.000000000 -0800
+++ patched/chrome/browser/content/browser/browser.xul	2012-03-25 11:06:21.930773362 -0700
@@ -287,12 +287,6 @@
 
     <key id="key_stop" keycode="VK_ESCAPE" oncommand="BrowserStop();"/>
 
-
-    <key id="key_gotoHistory"
-         key="&historySidebarCmd.commandKey;"
-         modifiers="accel"
-         command="viewHistorySidebar"/>
-
     <key id="key_fullZoomReduce"  key="&fullZoomReduceCmd.commandkey;"   command="cmd_fullZoomReduce"  modifiers="accel"/>
     <key                          key="&fullZoomReduceCmd.commandkey2;"  command="cmd_fullZoomReduce"  modifiers="accel"/>
     <key id="key_fullZoomEnlarge" key="&fullZoomEnlargeCmd.commandkey;"  command="cmd_fullZoomEnlarge" modifiers="accel"/>