diff --git a/mozilla/xpfe/browser/resources/content/navigator.js b/mozilla/xpfe/browser/resources/content/navigator.js
index 742deb18f38..984a577949a 100644
--- a/mozilla/xpfe/browser/resources/content/navigator.js
+++ b/mozilla/xpfe/browser/resources/content/navigator.js
@@ -22,6 +22,7 @@
  * Contributor(s):
  *   Blake Ross <blakeross@telocity.com>
  *   Peter Annema <disttsc@bart.nl>
+ *   Dean Tessman <dean_tessman@hotmail.com>
  *
  * Alternatively, the contents of this file may be used under the terms of
  * either the GNU General Public License Version 2 or later (the "GPL"), or 
@@ -51,7 +52,10 @@ var gBrandRegionBundle;
 var gLastValidURLStr = "";
 var gLastValidURL = null;
 var gHaveUpdatedToolbarState = false;
-var gClickSelectsAll = -1;
+var gClickSelectsAll = false;
+var gIgnoreFocus = false;
+var gIgnoreFocusCount = 0;
+var gMouseDownX = -1;
 
 var pref = null;
 
@@ -477,6 +481,9 @@ function Startup()
   // initiated by a web page script
   addEventListener("fullscreen", onFullScreen, false);
 
+  // does clicking on the urlbar select its contents?
+  gClickSelectsAll = pref.getBoolPref("browser.urlbar.clickSelectsAll");
+
   // now load bookmarks after a delay
   setTimeout(LoadBookmarksCallback, 0);
 }
@@ -1543,21 +1550,66 @@ function getNewThemes()
 
 function URLBarFocusHandler(aEvent)
 {
-  if (gURLBar) {
-    if (gClickSelectsAll == -1)
-      gClickSelectsAll = pref.getBoolPref("browser.urlbar.clickSelectsAll");
-    if (gClickSelectsAll)
-      gURLBar.setSelectionRange(0, gURLBar.textLength);
-  }
+  if (gClickSelectsAll)
+    if (!gIgnoreFocus)
+      gURLBar.select();
+    else {
+      // check if gIgnoreFocusCount >= 2 because right-clicking on the url bar
+      // causes two blur and two focus events before the context menu is displayed.
+      // we need to eat all those events and not select all, because the user
+      // may want to work with the selection (eg. copy the selection).
+      // a normal click in URLBarMouseDownHandler() primes gIgnoreFocusCount
+      // to 1 so that when it hits this code it will only ignore 1 focus event.
+      gIgnoreFocusCount++;
+      if (gIgnoreFocusCount >= 2) {
+        gIgnoreFocusCount = 0;
+        gIgnoreFocus = false;
+      }
+    }
 }
 
 function URLBarBlurHandler(aEvent)
 {
-  // XXX why the hell do we have to do this?
-  if (gClickSelectsAll)
+  // reset the selection so the next time the urlbar is focused it
+  // doesn't re-select the old selection
+  if (gClickSelectsAll && !gIgnoreFocus)
     gURLBar.setSelectionRange(0, 0);
 }
 
+function URLBarMouseDownHandler(aEvent)
+{
+  gMouseDownX = -1;
+  if (gURLBar) {
+    if (gClickSelectsAll) {
+      var focusedElement = null;
+      if (document.commandDispatcher.focusedElement)
+        focusedElement = document.commandDispatcher.focusedElement.parentNode.parentNode.parentNode;
+      if (!focusedElement || (focusedElement && focusedElement != gURLBar))
+      {
+        // clicking onto the url bar when it doesn't have focus.
+        // see note in URLBarFocusHandler() about gIgnoreFocusCount.
+        gIgnoreFocusCount = 1;
+        gIgnoreFocus = true;
+        gMouseDownX = aEvent.screenX;
+      }
+      else if (aEvent.button == 2 && focusedElement && focusedElement == gURLBar) {
+        gIgnoreFocusCount = 0;
+        gIgnoreFocus = true;
+      }
+    }
+  }
+}
+
+function URLBarMouseUpHandler(aEvent)
+{
+  if (gMouseDownX > -1 && Math.abs(aEvent.screenX - gMouseDownX) <= 2) {
+    // mouse has moved less than two horizontal pixels between mouse down
+    // and mouse up - call it a click
+    gURLBar.select();
+    gMouseDownX = -1;
+  }
+}
+
 function URLBarKeyupHandler(aEvent)
 {
   if (aEvent.keyCode == aEvent.DOM_VK_TAB ) {
diff --git a/mozilla/xpfe/browser/resources/content/navigator.xul b/mozilla/xpfe/browser/resources/content/navigator.xul
index a381955bb2f..b1cfceec61d 100644
--- a/mozilla/xpfe/browser/resources/content/navigator.xul
+++ b/mozilla/xpfe/browser/resources/content/navigator.xul
@@ -18,7 +18,9 @@ Communications Corporation. Portions created by Netscape are
 Copyright (C) 1998-2000 Netscape Communications Corporation. All
 Rights Reserved.
 
-Contributor(s): ______________________________________. -->
+Contributor(s):
+	Dean Tessman <dean_tessman@hotmail.com>
+-->
 
 
 <?xml-stylesheet href="chrome://navigator/skin/" type="text/css"?> 
@@ -167,7 +169,9 @@ Contributor(s): ______________________________________. -->
                  ontextcommand="return handleURLBarCommand(eventParam, domEvent);"
                  ontextrevert="return handleURLBarRevert();"
                  onfocus="URLBarFocusHandler(event);"
-                 onblur="URLBarBlurHandler(event);">
+                 onblur="URLBarBlurHandler(event);"
+                 onmousedown="URLBarMouseDownHandler(event);"
+                 onmouseup="URLBarMouseUpHandler(event);">
           <deck id="page-proxy-deck">
             <image id="page-proxy-button"
                    onclick="BookmarksUtils.addBookmarkForBrowser(getBrowser().webNavigation, true);"