diff --git a/suite/browser/navigator.js b/suite/browser/navigator.js
index 4d17ad76318b..85ccef42855b 100644
--- a/suite/browser/navigator.js
+++ b/suite/browser/navigator.js
@@ -1318,6 +1318,13 @@ function URLBarBlurHandler(aEvent)
     gURLBar.setSelectionRange(0, 0);
 }
 
+function URLBarKeyupHandler(aEvent)
+{
+  if (aEvent.keyCode == aEvent.DOM_VK_TAB ) {
+    ShowAndSelectContentsOfURLBar();
+  }
+}
+
 // This function gets the "windows hooks" service and has it check its setting
 // This will do nothing on platforms other than Windows.
 function checkForDefaultBrowser()
diff --git a/suite/browser/navigator.xul b/suite/browser/navigator.xul
index 6f4b4d7bc4cf..3d3c63e540c8 100644
--- a/suite/browser/navigator.xul
+++ b/suite/browser/navigator.xul
@@ -165,6 +165,7 @@ Contributor(s): ______________________________________. -->
                      ontextcommand="return handleURLBarCommand(userAction);"
                      ontextrevert="return handleURLBarRevert();"
                      onmouseup="URLBarMouseupHandler(event);"
+                     onkeyup="URLBarKeyupHandler(event);"
                      onblur="URLBarBlurHandler(event);">
               <image id="page-proxy-button" allowevents="true"
                      ondraggesture="PageProxyDragGesture(event);"/>