diff --git a/app/assets/javascripts/discourse/app/components/d-modal-body.js b/app/assets/javascripts/discourse/app/components/d-modal-body.js
index f01bc23aa9a..ea643d3d824 100644
--- a/app/assets/javascripts/discourse/app/components/d-modal-body.js
+++ b/app/assets/javascripts/discourse/app/components/d-modal-body.js
@@ -1,15 +1,17 @@
+import { attributeBindings, classNames } from "@ember-decorators/component";
 import Component from "@ember/component";
 import { scheduleOnce } from "@ember/runloop";
-export default Component.extend({
-  classNames: ["modal-body"],
-  fixed: false,
-  submitOnEnter: true,
-  dismissable: true,
-  attributeBindings: ["tabindex"],
-  tabindex: -1,
+
+@classNames("modal-body")
+@attributeBindings("tabindex")
+export default class DModalBody extends Component {
+  fixed = false;
+  submitOnEnter = true;
+  dismissable = true;
+  tabindex = -1;
 
   didInsertElement() {
-    this._super(...arguments);
+    super.didInsertElement(...arguments);
     this._modalAlertElement = document.getElementById("modal-alert");
     if (this._modalAlertElement) {
       this._clearFlash();
@@ -24,14 +26,14 @@ export default Component.extend({
     scheduleOnce("afterRender", this, this._afterFirstRender);
     this.appEvents.on("modal-body:flash", this, "_flash");
     this.appEvents.on("modal-body:clearFlash", this, "_clearFlash");
-  },
+  }
 
   willDestroyElement() {
-    this._super(...arguments);
+    super.willDestroyElement(...arguments);
     this.appEvents.off("modal-body:flash", this, "_flash");
     this.appEvents.off("modal-body:clearFlash", this, "_clearFlash");
     this.appEvents.trigger("modal:body-dismissed");
-  },
+  }
 
   _afterFirstRender() {
     const maxHeight = this.maxHeight;
@@ -57,7 +59,7 @@ export default Component.extend({
         "headerClass"
       )
     );
-  },
+  }
 
   _clearFlash() {
     if (this._modalAlertElement) {
@@ -70,7 +72,7 @@ export default Component.extend({
         "alert-warning"
       );
     }
-  },
+  }
 
   _flash(msg) {
     this._clearFlash();
@@ -83,5 +85,5 @@ export default Component.extend({
       `alert-${msg.messageClass || "success"}`
     );
     this._modalAlertElement.innerHTML = msg.text || "";
-  },
-});
+  }
+}
diff --git a/app/assets/javascripts/discourse/app/components/d-modal.js b/app/assets/javascripts/discourse/app/components/d-modal.js
index 732f51948f8..34cd460785b 100644
--- a/app/assets/javascripts/discourse/app/components/d-modal.js
+++ b/app/assets/javascripts/discourse/app/components/d-modal.js
@@ -1,37 +1,41 @@
+import {
+  attributeBindings,
+  classNameBindings,
+} from "@ember-decorators/component";
 import Component from "@ember/component";
 import I18n from "I18n";
 import { next, schedule } from "@ember/runloop";
 import discourseComputed, { bind } from "discourse-common/utils/decorators";
 
-export default Component.extend({
-  classNameBindings: [
-    ":modal",
-    ":d-modal",
-    "modalClass",
-    "modalStyle",
-    "hasPanels",
-  ],
-  attributeBindings: [
-    "data-keyboard",
-    "aria-modal",
-    "role",
-    "ariaLabelledby:aria-labelledby",
-  ],
-  submitOnEnter: true,
-  dismissable: true,
-  title: null,
-  titleAriaElementId: null,
-  subtitle: null,
-  role: "dialog",
-  headerClass: null,
+@classNameBindings(
+  ":modal",
+  ":d-modal",
+  "modalClass",
+  "modalStyle",
+  "hasPanels"
+)
+@attributeBindings(
+  "dataKeyboard:data-keyboard",
+  "ariaModal:aria-modal",
+  "role",
+  "ariaLabelledby:aria-labelledby"
+)
+export default class DModal extends Component {
+  submitOnEnter = true;
+  dismissable = true;
+  title = null;
+  titleAriaElementId = null;
+  subtitle = null;
+  role = "dialog";
+  headerClass = null;
 
-  // We handle ESC ourselves
-  "data-keyboard": "false",
-  // Inform screen readers of the modal
-  "aria-modal": "true",
+  // // We handle ESC ourselves
+  dataKeyboard = "false";
+  // // Inform screen readers of the modal
+  ariaModal = "true";
 
   init() {
-    this._super(...arguments);
+    super.init(...arguments);
 
     // If we need to render a second modal for any reason, we can't
     // use `elementId`
@@ -39,27 +43,27 @@ export default Component.extend({
       this.set("elementId", "discourse-modal");
       this.set("modalStyle", "fixed-modal");
     }
-  },
+  }
 
   didInsertElement() {
-    this._super(...arguments);
+    super.didInsertElement(...arguments);
 
     this.appEvents.on("modal:body-shown", this, "_modalBodyShown");
     document.documentElement.addEventListener(
       "keydown",
       this._handleModalEvents
     );
-  },
+  }
 
   willDestroyElement() {
-    this._super(...arguments);
+    super.willDestroyElement(...arguments);
 
     this.appEvents.off("modal:body-shown", this, "_modalBodyShown");
     document.documentElement.removeEventListener(
       "keydown",
       this._handleModalEvents
     );
-  },
+  }
 
   @discourseComputed("title", "titleAriaElementId")
   ariaLabelledby(title, titleAriaElementId) {
@@ -71,7 +75,7 @@ export default Component.extend({
     }
 
     return;
-  },
+  }
 
   triggerClickOnEnter(e) {
     if (!this.submitOnEnter) {
@@ -87,7 +91,7 @@ export default Component.extend({
     }
 
     return true;
-  },
+  }
 
   mouseDown(e) {
     if (!this.dismissable) {
@@ -103,7 +107,7 @@ export default Component.extend({
       // it unclickable.
       return this.attrs.closeModal?.("initiatedByClickOut");
     }
-  },
+  }
 
   _modalBodyShown(data) {
     if (this.isDestroying || this.isDestroyed) {
@@ -145,7 +149,7 @@ export default Component.extend({
     schedule("afterRender", () => {
       this._trapTab();
     });
-  },
+  }
 
   @bind
   _handleModalEvents(event) {
@@ -165,7 +169,7 @@ export default Component.extend({
     if (event.key === "Tab") {
       this._trapTab(event);
     }
-  },
+  }
 
   _trapTab(event) {
     if (this.element.classList.contains("hidden")) {
@@ -221,5 +225,5 @@ export default Component.extend({
         event.preventDefault();
       }
     }
-  },
-});
+  }
+}