--- a/browser/base/content/browser.css
+++ b/browser/base/content/browser.css
@@ -469,22 +469,20 @@ toolbar:not(#TabsToolbar) > #personal-bo
   display: -moz-box;
 }
 
 #reload-button:not([displaystop]) + #stop-button,
 #reload-button[displaystop] {
   visibility: collapse;
 }
 
-/* The reload-button is only disabled temporarily when it becomes visible
-   to prevent users from accidentally clicking it. We don't however need
-   to show this disabled state, as the flicker that it generates is short
-   enough to be visible but not long enough to explain anything to users. */
-#reload-button[disabled]:not(:-moz-window-inactive) > .toolbarbutton-icon {
-  opacity: 1 !important;
+/* Temporarily disable the reload button to prevent the user from
+   accidentally reloading the page when intending to click the stop button. */
+#reload-button[temporarily-disabled] {
+  pointer-events: none;
 }
 
 #PanelUI-feeds > .feed-toolbarbutton:-moz-locale-dir(rtl) {
   direction: rtl;
 }
 
 #panelMenu_bookmarksMenu > .bookmark-item {
   max-width: none;

--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -4963,21 +4963,20 @@ var CombinedStopReload = {
       return;
     }
 
     if (this._timer)
       return;
 
     // Temporarily disable the reload button to prevent the user from
     // accidentally reloading the page when intending to click the stop button
-    this.reload.disabled = true;
+    this.reload.setAttribute("temporarily-disabled", "true");
     this._timer = setTimeout(function(self) {
       self._timer = 0;
-      self.reload.disabled = XULBrowserWindow.reloadCommand
-                                             .getAttribute("disabled") == "true";
+      self.reload.removeAttribute("temporarily-disabled");
     }, 650, this);
   },
 
   _cancelTransition() {
     if (this._timer) {
       clearTimeout(this._timer);
       this._timer = 0;
     }