diff --git a/app/components/rdfa-editor-container.hbs b/app/components/rdfa-editor-container.hbs
index 7984cb86..1224672b 100644
--- a/app/components/rdfa-editor-container.hbs
+++ b/app/components/rdfa-editor-container.hbs
@@ -41,7 +41,7 @@
         </:top>
         <:default>
           <Editor
-            @plugins={{@plugins}}
+            @plugins={{this.plugins}}
             @schema={{@schema}}
             @nodeViews={{@nodeViews}}
             @rdfaEditorInit={{this.rdfaEditorInit}}
diff --git a/app/components/rdfa-editor-container.js b/app/components/rdfa-editor-container.js
index c33554f7..016428d0 100644
--- a/app/components/rdfa-editor-container.js
+++ b/app/components/rdfa-editor-container.js
@@ -1,6 +1,9 @@
 import Component from '@glimmer/component';
 import { action } from '@ember/object';
 import { tracked } from '@glimmer/tracking';
+import { firefoxCursorFix } from '@lblod/ember-rdfa-editor/plugins/firefox-cursor-fix';
+import { lastKeyPressedPlugin } from '@lblod/ember-rdfa-editor/plugins/last-key-pressed';
+import { chromeHacksPlugin } from '@lblod/ember-rdfa-editor/plugins/chrome-hacks-plugin';
 
 export default class RdfaEditorContainerComponent extends Component {
   @tracked editor;
@@ -25,6 +28,15 @@ export default class RdfaEditorContainerComponent extends Component {
     };
   }
 
+  get plugins() {
+    const plugins = this.args.plugins || [];
+    return plugins.concat(
+      firefoxCursorFix(),
+      lastKeyPressedPlugin,
+      chromeHacksPlugin()
+    );
+  }
+
   get vocab() {
     return this.documentContext['vocab'];
   }
diff --git a/package-lock.json b/package-lock.json
index 92b271c5..eb19c5ef 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -25,7 +25,7 @@
         "@lblod/ember-acmidm-login": "^2.0.0-beta.1",
         "@lblod/ember-environment-banner": "^0.2.0",
         "@lblod/ember-mock-login": "^0.7.0",
-        "@lblod/ember-rdfa-editor": "^3.5.0",
+        "@lblod/ember-rdfa-editor": "^3.6.0",
         "@lblod/ember-rdfa-editor-lblod-plugins": "^4.0.2",
         "@release-it-plugins/lerna-changelog": "github:release-it-plugins/lerna-changelog",
         "babel-eslint": "^10.1.0",
@@ -3608,9 +3608,9 @@
       }
     },
     "node_modules/@lblod/ember-rdfa-editor": {
-      "version": "3.5.0",
-      "resolved": "https://registry.npmjs.org/@lblod/ember-rdfa-editor/-/ember-rdfa-editor-3.5.0.tgz",
-      "integrity": "sha512-7Xp3fR39cg1yhMlUZzaz5t1kJ8MPsCWA9WE2VEgTkYnnvh3rjh52dAvtf6GAjO1R3AJGplAYwl9Elf7c9Hb0hQ==",
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/@lblod/ember-rdfa-editor/-/ember-rdfa-editor-3.6.0.tgz",
+      "integrity": "sha512-tNTKUbB8Zc+ZFKVUKxy4YYwI1hi8Dof4QbmTA9tuhhqlGY8dV0zy2C7FN5cdvfGTXdFsKSGEGZnNdTC/9E+haQ==",
       "dev": true,
       "dependencies": {
         "@codemirror/lang-html": "^6.1.1",
diff --git a/package.json b/package.json
index d671f91a..d2663023 100644
--- a/package.json
+++ b/package.json
@@ -37,7 +37,7 @@
     "@lblod/ember-acmidm-login": "^2.0.0-beta.1",
     "@lblod/ember-environment-banner": "^0.2.0",
     "@lblod/ember-mock-login": "^0.7.0",
-    "@lblod/ember-rdfa-editor": "^3.5.0",
+    "@lblod/ember-rdfa-editor": "^3.6.0",
     "@lblod/ember-rdfa-editor-lblod-plugins": "^4.0.2",
     "@release-it-plugins/lerna-changelog": "github:release-it-plugins/lerna-changelog",
     "babel-eslint": "^10.1.0",