diff --git a/mozilla/xpfe/browser/resources/content/navigator.js b/mozilla/xpfe/browser/resources/content/navigator.js
index 0d52f4021d7..11ae3bbe8b8 100644
--- a/mozilla/xpfe/browser/resources/content/navigator.js
+++ b/mozilla/xpfe/browser/resources/content/navigator.js
@@ -1808,3 +1808,15 @@ function getNewThemes()
 {
 window._content.location.href = brandBundle.GetStringFromName("getNewThemesURL");
 }
+
+function URLBarFocusHandler(aEvent)
+{
+  var URLBar = aEvent.target;
+  URLBar.setSelectionRange(0, URLBar.value.length);
+}
+
+function URLBarBlurHandler(aEvent)
+{
+  var URLBar = aEvent.target;
+  URLBar.setSelectionRange(0, 0);
+}
diff --git a/mozilla/xpfe/browser/resources/content/navigator.xul b/mozilla/xpfe/browser/resources/content/navigator.xul
index 89434b3865a..9ba845b0b20 100644
--- a/mozilla/xpfe/browser/resources/content/navigator.xul
+++ b/mozilla/xpfe/browser/resources/content/navigator.xul
@@ -289,6 +289,8 @@ Contributor(s): ______________________________________. -->
     	      <image id="page-proxy-button" ondraggesture="nsDragAndDrop.startDrag(event, proxyIconDNDObserver);"/> 
 	          <textfield autocomplete="true" timeout="300" class="plain" 
 	                     searchSessionType="urlbar" id="urlbar" tooltip="aTooltip" tooltiptext="&locationBar.tooltip;"
+           						 onblur="URLBarBlurHandler(event);"
+ 					          	 onfocus="URLBarFocusHandler(event);"
 	                     onkeypress="if( event.keyCode == 13 ) { addToUrlbarHistory(); BrowserLoadURL(); }" flex="1"/>  
           </box>
           <menubutton class="menubutton-icon" id="ubhist">
diff --git a/mozilla/xpfe/components/autocomplete/resources/content/autocomplete.xml b/mozilla/xpfe/components/autocomplete/resources/content/autocomplete.xml
index 9aac584f5c6..ca3d14695c7 100644
--- a/mozilla/xpfe/components/autocomplete/resources/content/autocomplete.xml
+++ b/mozilla/xpfe/components/autocomplete/resources/content/autocomplete.xml
@@ -8,7 +8,7 @@
 <binding id="autocomplete" extends="chrome://global/content/xulBindings.xml#textfield">
     <content excludes="template,observes,menupopup">
         <xul:box class="textfield-internal-box" flex="1">
-            <html:input class="textfield-input" flex="1" inherits="value,type,maxlength,disabled,size,readonly"/>
+            <html:input class="textfield-input" flex="1" inherits="onfocus,onblur,value,type,maxlength,disabled,size,readonly"/>
             <xul:popupset ignorekeys="true"
 				oncommand="var me = this.parentNode.parentNode; me.privatefunc.onMenuCommand(me, this);"
 			>