diff --git a/devtools/client/themes/webconsole.css b/devtools/client/themes/webconsole.css
index 85c73264c..89bb38628 100644
--- a/devtools/client/themes/webconsole.css
+++ b/devtools/client/themes/webconsole.css
@@ -14,6 +14,7 @@
 
 a {
   -moz-user-focus: normal;
+  -moz-user-input: enabled;
   cursor: pointer;
   text-decoration: underline;
 }
diff --git a/devtools/shared/css/generated/properties-db.js b/devtools/shared/css/generated/properties-db.js
index eda2c7148..25d9e2d33 100644
--- a/devtools/shared/css/generated/properties-db.js
+++ b/devtools/shared/css/generated/properties-db.js
@@ -1440,6 +1440,8 @@ exports.CSS_PROPERTIES = {
     "supports": [],
     "values": [
       "auto",
+      "disabled",
+      "enabled",
       "inherit",
       "initial",
       "none",
diff --git a/dom/html/HTMLLabelElement.h b/dom/html/HTMLLabelElement.h
index 4057ffef6..c8385fc53 100644
--- a/dom/html/HTMLLabelElement.h
+++ b/dom/html/HTMLLabelElement.h
@@ -59,6 +59,8 @@ public:
   using nsGenericHTMLElement::Focus;
   virtual void Focus(mozilla::ErrorResult& aError) override;
 
+  virtual bool IsDisabled() const override { return false; }
+
   // nsIContent
   virtual nsresult PostHandleEvent(
                      EventChainPostVisitor& aVisitor) override;
diff --git a/dom/html/HTMLObjectElement.h b/dom/html/HTMLObjectElement.h
index 6ce09e1cc..016743c2c 100644
--- a/dom/html/HTMLObjectElement.h
+++ b/dom/html/HTMLObjectElement.h
@@ -72,6 +72,8 @@ public:
   NS_IMETHOD Reset() override;
   NS_IMETHOD SubmitNamesValues(HTMLFormSubmission *aFormSubmission) override;
 
+  virtual bool IsDisabled() const override { return false; }
+
   virtual void DoneAddingChildren(bool aHaveNotified) override;
   virtual bool IsDoneAddingChildren() override;
 
diff --git a/dom/html/HTMLOptGroupElement.cpp b/dom/html/HTMLOptGroupElement.cpp
index 63af4e39f..7467c5da3 100644
--- a/dom/html/HTMLOptGroupElement.cpp
+++ b/dom/html/HTMLOptGroupElement.cpp
@@ -53,14 +53,15 @@ HTMLOptGroupElement::GetEventTargetParent(EventChainPreVisitor& aVisitor)
   aVisitor.mCanHandle = false;
   // Do not process any DOM events if the element is disabled
   // XXXsmaug This is not the right thing to do. But what is?
-  if (IsDisabled()) {
+  if (HasAttr(kNameSpaceID_None, nsGkAtoms::disabled)) {
     return NS_OK;
   }
 
-  if (nsIFrame* frame = GetPrimaryFrame()) {
-    // FIXME(emilio): This poking at the style of the frame is broken unless we
-    // flush before every event handling, which we don't really want to.
-    if (frame->StyleUserInterface()->mUserInput == StyleUserInput::None) {
+  nsIFrame* frame = GetPrimaryFrame();
+  if (frame) {
+    const nsStyleUserInterface* uiStyle = frame->StyleUserInterface();
+    if (uiStyle->mUserInput == StyleUserInput::None ||
+        uiStyle->mUserInput == StyleUserInput::Disabled) {
       return NS_OK;
     }
   }
diff --git a/dom/html/HTMLOptGroupElement.h b/dom/html/HTMLOptGroupElement.h
index 6853e51ed..d12f1c6d4 100644
--- a/dom/html/HTMLOptGroupElement.h
+++ b/dom/html/HTMLOptGroupElement.h
@@ -49,6 +49,10 @@ public:
 
   virtual nsIDOMNode* AsDOMNode() override { return this; }
 
+  virtual bool IsDisabled() const override {
+    return HasAttr(kNameSpaceID_None, nsGkAtoms::disabled);
+  }
+
   bool Disabled() const
   {
     return GetBoolAttr(nsGkAtoms::disabled);
diff --git a/dom/html/HTMLOptionElement.h b/dom/html/HTMLOptionElement.h
index 965cdeb8f..de556b645 100644
--- a/dom/html/HTMLOptionElement.h
+++ b/dom/html/HTMLOptionElement.h
@@ -69,6 +69,10 @@ public:
 
   nsresult CopyInnerTo(mozilla::dom::Element* aDest);
 
+  virtual bool IsDisabled() const override {
+    return HasAttr(kNameSpaceID_None, nsGkAtoms::disabled);
+  }
+
   bool Disabled() const
   {
     return GetBoolAttr(nsGkAtoms::disabled);
diff --git a/dom/html/HTMLOutputElement.h b/dom/html/HTMLOutputElement.h
index 6b6c3f66c..588262480 100644
--- a/dom/html/HTMLOutputElement.h
+++ b/dom/html/HTMLOutputElement.h
@@ -35,6 +35,8 @@ public:
   NS_IMETHOD Reset() override;
   NS_IMETHOD SubmitNamesValues(HTMLFormSubmission* aFormSubmission) override;
 
+  virtual bool IsDisabled() const override { return false; }
+
   nsresult Clone(mozilla::dom::NodeInfo* aNodeInfo, nsINode** aResult) const override;
 
   bool ParseAttribute(int32_t aNamespaceID, nsIAtom* aAttribute,
diff --git a/dom/html/nsGenericHTMLElement.cpp b/dom/html/nsGenericHTMLElement.cpp
index 3cf19ea8f..aa70f9cdf 100644
--- a/dom/html/nsGenericHTMLElement.cpp
+++ b/dom/html/nsGenericHTMLElement.cpp
@@ -2108,6 +2108,14 @@ nsGenericHTMLFormElement::PreHandleEvent(EventChainVisitor& aVisitor)
   return nsGenericHTMLElement::PreHandleEvent(aVisitor);
 }
 
+/* virtual */
+bool
+nsGenericHTMLFormElement::IsDisabled() const
+{
+  return HasAttr(kNameSpaceID_None, nsGkAtoms::disabled) ||
+         (mFieldSet && mFieldSet->IsDisabled());
+}
+
 void
 nsGenericHTMLFormElement::ForgetFieldSet(nsIContent* aFieldset)
 {
@@ -2299,13 +2307,14 @@ nsGenericHTMLFormElement::IsElementDisabledForEvents(EventMessage aMessage,
       break;
   }
 
-  // FIXME(emilio): This poking at the style of the frame is slightly bogus
-  // unless we flush before every event, which we don't really want to do.
-  if (aFrame &&
-      aFrame->StyleUserInterface()->mUserInput == StyleUserInput::None) {
-    return true;
+  bool disabled = IsDisabled();
+  if (!disabled && aFrame) {
+    const nsStyleUserInterface* uiStyle = aFrame->StyleUserInterface();
+    disabled = uiStyle->mUserInput == StyleUserInput::None ||
+               uiStyle->mUserInput == StyleUserInput::Disabled;
+
   }
-  return IsDisabled();
+  return disabled;
 }
 
 void
diff --git a/dom/html/nsGenericHTMLElement.h b/dom/html/nsGenericHTMLElement.h
index 1b0977fa2..9886e10f5 100644
--- a/dom/html/nsGenericHTMLElement.h
+++ b/dom/html/nsGenericHTMLElement.h
@@ -807,8 +807,8 @@ public:
   /**
    * Returns the current disabled state of the element.
    */
-  bool IsDisabled() const {
-    return HasAttr(kNameSpaceID_None, nsGkAtoms::disabled);
+  virtual bool IsDisabled() const {
+    return false;
   }
 
   bool IsHidden() const
@@ -1219,6 +1219,8 @@ public:
   virtual nsresult PreHandleEvent(
                      mozilla::EventChainVisitor& aVisitor) override;
 
+  virtual bool IsDisabled() const override;
+
   /**
    * This callback is called by a fieldest on all its elements whenever its
    * disabled attribute is changed so the element knows its disabled state
diff --git a/dom/interfaces/base/nsIDOMWindowUtils.idl b/dom/interfaces/base/nsIDOMWindowUtils.idl
index fcfe407e8..70ec7e0ae 100644
--- a/dom/interfaces/base/nsIDOMWindowUtils.idl
+++ b/dom/interfaces/base/nsIDOMWindowUtils.idl
@@ -1786,7 +1786,7 @@ interface nsIDOMWindowUtils : nsISupports {
   /**
    * In certain cases the event handling of nodes, form controls in practice,
    * may be disabled. Such cases are for example the existence of disabled
-   * attribute or -moz-user-input: none.
+   * attribute or -moz-user-input: none/disabled.
    */
   boolean isNodeDisabledForEvents(in nsIDOMNode aNode);
 
diff --git a/layout/base/nsCaret.cpp b/layout/base/nsCaret.cpp
index 8396726c6..eca22f3ba 100644
--- a/layout/base/nsCaret.cpp
+++ b/layout/base/nsCaret.cpp
@@ -511,7 +511,7 @@ nsCaret::GetPaintGeometry(nsRect* aRect)
   CheckSelectionLanguageChange();
 
   int32_t frameOffset;
-  nsIFrame* frame = GetFrameAndOffset(GetSelectionInternal(),
+  nsIFrame *frame = GetFrameAndOffset(GetSelectionInternal(),
       mOverrideContent, mOverrideOffset, &frameOffset);
   if (!frame) {
     return nullptr;
@@ -521,7 +521,8 @@ nsCaret::GetPaintGeometry(nsRect* aRect)
   const nsStyleUserInterface* userinterface = frame->StyleUserInterface();
   if ((!mIgnoreUserModify &&
        userinterface->mUserModify == StyleUserModify::ReadOnly) ||
-      frame->IsContentDisabled()){
+      userinterface->mUserInput == StyleUserInput::None ||
+      userinterface->mUserInput == StyleUserInput::Disabled) {
     return nullptr;
   }
 
diff --git a/layout/forms/nsComboboxControlFrame.cpp b/layout/forms/nsComboboxControlFrame.cpp
index 1064778d6..9db6ae5e4 100644
--- a/layout/forms/nsComboboxControlFrame.cpp
+++ b/layout/forms/nsComboboxControlFrame.cpp
@@ -1166,7 +1166,9 @@ nsComboboxControlFrame::HandleEvent(nsPresContext* aPresContext,
 
   // If we have style that affects how we are selected, feed event down to
   // nsFrame::HandleEvent so that selection takes place when appropriate.
-  if (IsContentDisabled()) {
+  const nsStyleUserInterface* uiStyle = StyleUserInterface();
+  if (uiStyle->mUserInput == StyleUserInput::None ||
+      uiStyle->mUserInput == StyleUserInput::Disabled) {
     return nsBlockFrame::HandleEvent(aPresContext, aEvent, aEventStatus);
   }
   return NS_OK;
diff --git a/layout/forms/nsFormControlFrame.cpp b/layout/forms/nsFormControlFrame.cpp
index 8dbe564dd..4ee62acbf 100644
--- a/layout/forms/nsFormControlFrame.cpp
+++ b/layout/forms/nsFormControlFrame.cpp
@@ -183,8 +183,10 @@ nsFormControlFrame::HandleEvent(nsPresContext* aPresContext,
                                 WidgetGUIEvent* aEvent,
                                 nsEventStatus* aEventStatus)
 {
-  // Check for disabled content so that selection works properly (?).
-  if (IsContentDisabled()) {
+  // Check for user-input:none style
+  const nsStyleUserInterface* uiStyle = StyleUserInterface();
+  if (uiStyle->mUserInput == StyleUserInput::None ||
+      uiStyle->mUserInput == StyleUserInput::Disabled) {
     return nsFrame::HandleEvent(aPresContext, aEvent, aEventStatus);
   }
   return NS_OK;
diff --git a/layout/forms/nsGfxButtonControlFrame.cpp b/layout/forms/nsGfxButtonControlFrame.cpp
index df729c1aa..768abbc21 100644
--- a/layout/forms/nsGfxButtonControlFrame.cpp
+++ b/layout/forms/nsGfxButtonControlFrame.cpp
@@ -203,7 +203,10 @@ nsGfxButtonControlFrame::HandleEvent(nsPresContext* aPresContext,
   // from being called. The nsFrame::HandleEvent causes the button label
   // to be selected (Drawn with an XOR rectangle over the label)
 
-  if (IsContentDisabled()) {
+  // do we have user-input style?
+  const nsStyleUserInterface* uiStyle = StyleUserInterface();
+  if (uiStyle->mUserInput == StyleUserInput::None ||
+      uiStyle->mUserInput == StyleUserInput::Disabled) {
     return nsFrame::HandleEvent(aPresContext, aEvent, aEventStatus);
   }
   return NS_OK;
diff --git a/layout/forms/nsImageControlFrame.cpp b/layout/forms/nsImageControlFrame.cpp
index 8aef41538..212fa9356 100644
--- a/layout/forms/nsImageControlFrame.cpp
+++ b/layout/forms/nsImageControlFrame.cpp
@@ -150,9 +150,15 @@ nsImageControlFrame::HandleEvent(nsPresContext* aPresContext,
     return NS_OK;
   }
 
-  if (IsContentDisabled()) {
+  // do we have user-input style?
+  const nsStyleUserInterface* uiStyle = StyleUserInterface();
+  if (uiStyle->mUserInput == StyleUserInput::None ||
+      uiStyle->mUserInput == StyleUserInput::Disabled) {
     return nsFrame::HandleEvent(aPresContext, aEvent, aEventStatus);
   }
+  if (mContent->HasAttr(kNameSpaceID_None, nsGkAtoms::disabled)) { // XXX cache disabled
+    return NS_OK;
+  }
 
   *aEventStatus = nsEventStatus_eIgnore;
 
diff --git a/layout/forms/nsListControlFrame.cpp b/layout/forms/nsListControlFrame.cpp
index 2233c5996..7bd356a22 100644
--- a/layout/forms/nsListControlFrame.cpp
+++ b/layout/forms/nsListControlFrame.cpp
@@ -919,11 +919,16 @@ nsListControlFrame::HandleEvent(nsPresContext* aPresContext,
   if (nsEventStatus_eConsumeNoDefault == *aEventStatus)
     return NS_OK;
 
-  // disabled state affects how we're selected, but we don't want to go through
-  // nsHTMLScrollFrame if we're disabled.
-  if (IsContentDisabled()) {
+  // do we have style that affects how we are selected?
+  // do we have user-input style?
+  const nsStyleUserInterface* uiStyle = StyleUserInterface();
+  if (uiStyle->mUserInput == StyleUserInput::None ||
+      uiStyle->mUserInput == StyleUserInput::Disabled) {
     return nsFrame::HandleEvent(aPresContext, aEvent, aEventStatus);
   }
+  EventStates eventStates = mContent->AsElement()->State();
+  if (eventStates.HasState(NS_EVENT_STATE_DISABLED))
+    return NS_OK;
 
   return nsHTMLScrollFrame::HandleEvent(aPresContext, aEvent, aEventStatus);
 }
diff --git a/layout/generic/nsFrame.cpp b/layout/generic/nsFrame.cpp
index 34bf8423d..93090abf4 100644
--- a/layout/generic/nsFrame.cpp
+++ b/layout/generic/nsFrame.cpp
@@ -5596,19 +5596,6 @@ nsFrame::Reflow(nsPresContext*          aPresContext,
   NS_FRAME_SET_TRUNCATION(aStatus, aReflowInput, aDesiredSize);
 }
 
-bool
-nsIFrame::IsContentDisabled() const
-{
-  // FIXME(emilio): Doing this via CSS means callers must ensure the style is up
-  // to date, and they don't!
-  if (StyleUserInterface()->mUserInput == StyleUserInput::None) {
-    return true;
-  }
-
-  auto* element = nsGenericHTMLElement::FromContentOrNull(GetContent());
-  return element && element->IsDisabled();
-}
-
 nsresult
 nsFrame::CharacterDataChanged(CharacterDataChangeInfo* aInfo)
 {
diff --git a/layout/generic/nsIFrame.h b/layout/generic/nsIFrame.h
index 3db18a9a6..dfe83bcbe 100644
--- a/layout/generic/nsIFrame.h
+++ b/layout/generic/nsIFrame.h
@@ -2440,11 +2440,6 @@ public:
    */
   nsIWidget* GetNearestWidget(nsPoint& aOffset) const;
 
-  /**
-   * Whether the content for this frame is disabled, used for event handling.
-   */
-  bool IsContentDisabled() const;
-
   /**
    * Get the "type" of the frame. May return nullptr.
    *
diff --git a/layout/style/nsCSSProps.cpp b/layout/style/nsCSSProps.cpp
index 289a16ecd..ac2978c27 100644
--- a/layout/style/nsCSSProps.cpp
+++ b/layout/style/nsCSSProps.cpp
@@ -2189,6 +2189,8 @@ const KTableEntry nsCSSProps::kUserFocusKTable[] = {
 
 const KTableEntry nsCSSProps::kUserInputKTable[] = {
   { eCSSKeyword_none,     StyleUserInput::None },
+  { eCSSKeyword_enabled,  StyleUserInput::Enabled },
+  { eCSSKeyword_disabled, StyleUserInput::Disabled },
   { eCSSKeyword_auto,     StyleUserInput::Auto },
   { eCSSKeyword_UNKNOWN,  -1 }
 };
diff --git a/layout/style/nsStyleConsts.h b/layout/style/nsStyleConsts.h
index 5412eed26..6d207aec9 100644
--- a/layout/style/nsStyleConsts.h
+++ b/layout/style/nsStyleConsts.h
@@ -241,6 +241,8 @@ enum class StyleUserSelect : uint8_t {
 // user-input
 enum class StyleUserInput : uint8_t {
   None,
+  Enabled,
+  Disabled,
   Auto,
 };
 
diff --git a/layout/style/res/forms.css b/layout/style/res/forms.css
index c91c2f739..db75151d4 100644
--- a/layout/style/res/forms.css
+++ b/layout/style/res/forms.css
@@ -425,6 +425,7 @@ optgroup:disabled,
 select:disabled:disabled /* Need the pseudo-class twice to have the specificity
                             be at least the same as select[size][multiple] above */
 {
+  -moz-user-input: disabled;
   color: GrayText;
   background-color: ThreeDLightShadow;
   cursor: inherit;
diff --git a/layout/style/test/property_database.js b/layout/style/test/property_database.js
index 3486d15d0..c75f7b498 100644
--- a/layout/style/test/property_database.js
+++ b/layout/style/test/property_database.js
@@ -2203,7 +2203,7 @@ var gCSSProperties = {
     inherited: true,
     type: CSS_TYPE_LONGHAND,
     initial_values: [ "auto" ],
-    other_values: [ "none" ],
+    other_values: [ "none", "enabled", "disabled" ],
     invalid_values: []
   },
   "-moz-user-modify": {
diff --git a/testing/web-platform/meta/MANIFEST.json b/testing/web-platform/meta/MANIFEST.json
index 4dbbdf43e..03dda4a1f 100644
--- a/testing/web-platform/meta/MANIFEST.json
+++ b/testing/web-platform/meta/MANIFEST.json
@@ -15393,10 +15393,6 @@
         "path": "dom/events/EventTarget-removeEventListener.html",
         "url": "/dom/events/EventTarget-removeEventListener.html"
       },
-      {
-	"path": "dom/events/event-disabled-dynamic.html",
-	"url": "/dom/events/event-disabled-dynamic.html"
-      },
       {
         "path": "dom/events/ProgressEvent.html",
         "url": "/dom/events/ProgressEvent.html"
diff --git a/testing/web-platform/tests/dom/events/event-disabled-dynamic.html b/testing/web-platform/tests/dom/events/event-disabled-dynamic.html
deleted file mode 100644
index 89a3d3b15..000000000
--- a/testing/web-platform/tests/dom/events/event-disabled-dynamic.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<!doctype html>
-<meta charset=utf-8>
-<title>Test that disabled is honored immediately in presence of dynamic changes</title>
-<link rel="author" title="Emilio Cobos Álvarez" href="mailto:emilio@crisal.io">
-<link rel="author" title="Andreas Farre" href="mailto:afarre@mozilla.com">
-<link rel="help" href="https://html.spec.whatwg.org/multipage/#enabling-and-disabling-form-controls:-the-disabled-attribute">
-<link rel="help" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1405087">
-<script src=/resources/testharness.js></script>
-<script src=/resources/testharnessreport.js></script>
-<input type="button" value="Click" disabled>
-<script>
-async_test(t => {
-  window.addEventListener('load', t.step_func(() => {
-+
-−    let e = document.querySelector('input');
-    e.disabled = false;
-    e.onclick = t.step_func_done(() => {});
-    e.click();
-  }));
-}, "disabled is honored properly in presence of dynamic changes");
-</script>