diff --git a/extensions/markdown/js/src/forum/util/MarkdownAreaEditorDriver.js b/extensions/markdown/js/src/forum/util/MarkdownAreaEditorDriver.js
index 0fb835671..0cd2eea7d 100644
--- a/extensions/markdown/js/src/forum/util/MarkdownAreaEditorDriver.js
+++ b/extensions/markdown/js/src/forum/util/MarkdownAreaEditorDriver.js
@@ -1,23 +1,72 @@
 import MarkdownArea from 'mdarea';
 import BasicEditorDriver from 'flarum/utils/BasicEditorDriver';
 
+export class MarkdownEditorFlarumExtension {
+  constructor(oninput, callInputListeners, onsubmit) {
+    this.oninput = oninput;
+    this.callInputListeners = callInputListeners;
+    this.onsubmit = onsubmit;
+  }
+
+  handleKey(
+    prefix,
+    selection,
+    postfix,
+    evt
+  ) {
+    // setTimeout without a time executes after the call stack has cleared,
+    // so any DOM changes originating from mdarea (e.g. executing an undo)
+    // will be finished by then. At that time, `e.target.value` will represent
+    // the updated value of the textarea in response to the keypress.
+    setTimeout(() => {
+      this.oninput(evt.target.value);
+
+      if ((evt.metaKey || evt.ctrlKey) && evt.key === 'Enter') {
+        return this.onsubmit();
+      }
+
+      this.callInputListeners(evt);
+    });
+  }
+}
+
 export default class MarkdownAreaEditorDriver extends BasicEditorDriver {
   build(dom, params) {
-    super.build(dom, params);
+    this.el.className = params.classNames.join(' ');
+    this.el.disabled = params.disabled;
+    this.el.placeholder = params.placeholder;
+    this.el.value = params.value;
     this.el.id = params.textareaId;
 
+    dom.append(this.el);
+
     // We can't bind shortcutHandler directly in case `build`
     // runs before MarkdownToolbar's `oninit`.
     this.el.addEventListener('keydown', function (e) {
       return params.shortcutHandler(...arguments);
     });
 
+    const callInputListeners = (e) => {
+      params.inputListeners.forEach((listener) => {
+        listener();
+      });
+
+      e.redraw = false;
+    };
+
+    // This one can't be run through mdarea, but that doesn't matter
+    // because mdarea doesn't change value in response to clicks.
+    this.el.addEventListener('click', callInputListeners);
+
     this.mdarea = new MarkdownArea(this.el, {
       keyMap: {
         indent: ['Ctrl+m'],
         outdent: ['Ctrl+M'],
         inline: []
-      }
+      },
+      extensions: [
+        new MarkdownEditorFlarumExtension(params.oninput, callInputListeners, params.onsubmit)
+      ]
     });
   }