--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -2182,32 +2182,31 @@ function traceDocument()
 
 // Controls whether or not we do verbose tracing.
 function traceVerbose(verbose)
 {
   leakDetector.verbose = (verbose == "true");
 }
 #endif
 
-function URLBarSetURI(aURI, aValid) {
+function URLBarSetURI(aURI) {
   var value = gBrowser.userTypedValue;
   var valid = false;
 
   if (value == null) {
     let uri = aURI || getWebNavigation().currentURI;
 
     // Replace initial page URIs with an empty string
     // only if there's no opener (bug 370555).
     if (gInitialPages.indexOf(uri.spec) != -1)
       value = content.opener ? uri.spec : "";
     else
       value = losslessDecodeURI(uri);
 
-    let isBlank = (uri.spec == "about:blank");
-    valid = !isBlank && (!aURI || aValid);
+    valid = (uri.spec != "about:blank");
   }
 
   gURLBar.value = value;
   SetPageProxyState(valid ? "valid" : "invalid");
 }
 
 function losslessDecodeURI(aURI) {
   var value = aURI.spec;
@@ -4122,17 +4121,17 @@ var XULBrowserWindow = {
         gBrowser.setIcon(gBrowser.selectedTab, null);
 
       if (gURLBar) {
         // Strip off "wyciwyg://" and passwords for the location bar
         let uri = aLocationURI;
         try {
           uri = this._uriFixup.createExposableURI(uri);
         } catch (e) {}
-        URLBarSetURI(uri, true);
+        URLBarSetURI(uri);
 
         // Update starring UI
         PlacesStarButton.updateState();
       }
     }
     UpdateBackForwardCommands(gBrowser.webNavigation);
 
     if (gFindBarInitialized) {