diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index 47bb5e6b8112..24a19077e758 100644
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -3837,9 +3837,17 @@ nsBrowserStatusHandler.prototype =
               location = locationURI.spec;
             } catch (exception) {}
 
-          gURLBar.value = ""; // hack for bug 249322
-          gURLBar.value = location;
-          SetPageProxyState("valid");
+          if (getBrowser().forceSyncURLBarUpdate) {
+            gURLBar.value = ""; // hack for bug 249322
+            gURLBar.value = location;
+            SetPageProxyState("valid");
+          } else {
+            setTimeout(function(loc) {
+                         gURLBar.value = ""; // hack for bug 249322
+                         gURLBar.value = loc;
+                         SetPageProxyState("valid");
+                       }, 0, location);
+          }
 
           // Setting the urlBar value in some cases causes userTypedValue to
           // become set because of oninput, so reset it to its old value.
diff --git a/toolkit/content/widgets/tabbrowser.xml b/toolkit/content/widgets/tabbrowser.xml
index 579eda50c0c5..b75eb359c0ac 100644
--- a/toolkit/content/widgets/tabbrowser.xml
+++ b/toolkit/content/widgets/tabbrowser.xml
@@ -180,6 +180,9 @@
       <field name="mContextTab">
         null
       </field>
+      <field name="mModalDialogShowing">
+        false
+      </field>
       <field name="arrowKeysShouldWrap" readonly="true">
 #ifdef XP_MACOSX
         true
@@ -1698,8 +1701,6 @@
         </body>
       </method>
 
-      <field name="mDragTime">0</field>
-      <field name="mDragOverDelay">350</field>
       <method name="onDragOver">
         <parameter name="aEvent"/>
         <parameter name="aFlavour"/>
@@ -1727,13 +1728,8 @@
               }
 
               var isTabDrag = (aDragSession.sourceNode.parentNode == this.mTabContainer);
-              if (!isTabDrag && aEvent.target.localName == "tab") {
-                if (!this.mDragTime) 
-                  this.mDragTime = Date.now();
-                if (Date.now() >= this.mDragTime + this.mDragOverDelay)
-                  this.mTabContainer.selectedItem = aEvent.target;
+              if (!isTabDrag)
                 return;
-              }
 
               var newIndex = this.getNewIndex(aEvent);
 
@@ -1892,8 +1888,6 @@
         <parameter name="aDragSession"/>
         <body>
           <![CDATA[
-            this.mDragTime = 0;
-
             if (aDragSession.sourceNode &&
                 aDragSession.sourceNode.parentNode == this.mTabContainer &&
                 aDragSession.canDrop) {
@@ -2390,6 +2384,9 @@
                 onget="return this.mCurrentBrowser.userTypedValue;"
                 onset="return this.mCurrentBrowser.userTypedValue = val;"/>
 
+      <property name="forceSyncURLBarUpdate"
+                onget="return this.mModalDialogShowing;"/>
+
       <method name="createTooltip">
         <parameter name="event"/>
         <body>
@@ -2483,6 +2480,7 @@
 
           for (var i = 0; i < browsers.length; ++i) {
             if (this.getBrowserAtIndex(i).contentWindow == targetTop) {
+              this.mModalDialogShowing = true;
               this.selectedTab = this.mTabContainer.childNodes[i];
 
               break;
@@ -2490,6 +2488,14 @@
           }
         ]]>
       </handler>
+      <handler event="DOMModalDialogClosed" phase="capturing">
+        <![CDATA[
+          if (!event.isTrusted)
+            return;
+
+          this.mModalDialogShowing = false;
+        ]]>
+      </handler>
     </handlers>
   </binding>
 
