diff --git a/src/components/Editor.singleton.js b/src/components/Editor.singleton.js
new file mode 100644
index 00000000000..647251f6acc
--- /dev/null
+++ b/src/components/Editor.singleton.js
@@ -0,0 +1,17 @@
+/**
+ * Get instance of Editor component
+ * @return {Promise<*>}
+ */
+export default async function getEditorInstance() {
+	if (!window.EditorInstance) {
+		if (window.EditorInstanceImporting) {
+			await new Promise((resolve) => setTimeout(resolve, 500))
+			return getEditorInstance()
+		} else {
+			window.EditorInstanceImporting = true
+		}
+		const Editor = await import(/* webpackChunkName: "editor" */'./Editor.vue')
+		window.EditorInstance = Editor.default
+	}
+	return window.EditorInstance
+}
diff --git a/src/components/ViewerComponent.vue b/src/components/ViewerComponent.vue
index 6ddb359ae4f..43fa7530fba 100644
--- a/src/components/ViewerComponent.vue
+++ b/src/components/ViewerComponent.vue
@@ -32,11 +32,12 @@
 
 <script>
 import { getSharingToken } from '../helpers/token.js'
+import getEditorInstance from './Editor.singleton.js'
 
 export default {
 	name: 'ViewerComponent',
 	components: {
-		Editor: () => import(/* webpackChunkName: "editor" */'./Editor.vue'),
+		Editor: async () => { return await getEditorInstance() },
 	},
 	props: {
 		filename: {
diff --git a/src/views/RichWorkspace.vue b/src/views/RichWorkspace.vue
index 3c0c123e708..adbb40c3283 100644
--- a/src/views/RichWorkspace.vue
+++ b/src/views/RichWorkspace.vue
@@ -44,6 +44,7 @@
 import axios from '@nextcloud/axios'
 import { generateOcsUrl } from '@nextcloud/router'
 import { subscribe, unsubscribe } from '@nextcloud/event-bus'
+import getEditorInstance from '../components/Editor.singleton.js'
 
 const IS_PUBLIC = !!(document.getElementById('isPublic'))
 const WORKSPACE_URL = generateOcsUrl('apps/text' + (IS_PUBLIC ? '/public' : '') + '/workspace', 2)
@@ -51,7 +52,7 @@ const WORKSPACE_URL = generateOcsUrl('apps/text' + (IS_PUBLIC ? '/public' : '')
 export default {
 	name: 'RichWorkspace',
 	components: {
-		Editor: () => import(/* webpackChunkName: "editor" */'./../components/Editor.vue'),
+		Editor: async () => { return await getEditorInstance() },
 	},
 	props: {
 		path: {