diff --git a/app/src/interfaces/input-rich-text-html/tinymce-overrides.css b/app/src/interfaces/input-rich-text-html/tinymce-overrides.css
index 7875f2ec71..88f914ad7f 100644
--- a/app/src/interfaces/input-rich-text-html/tinymce-overrides.css
+++ b/app/src/interfaces/input-rich-text-html/tinymce-overrides.css
@@ -180,6 +180,10 @@ body.dark .tox .tox-toolbar__overflow {
 	z-index: 510;
 }
 
+.tox.tox-tinymce.tox-fullscreen {
+	z-index: 490;
+}
+
 .tox .tox-dialog {
 	color: var(--foreground-normal);
 	background-color: var(--background-page);
diff --git a/app/src/interfaces/input-rich-text-html/useImage.ts b/app/src/interfaces/input-rich-text-html/useImage.ts
index 6ea267ba76..67736b749f 100644
--- a/app/src/interfaces/input-rich-text-html/useImage.ts
+++ b/app/src/interfaces/input-rich-text-html/useImage.ts
@@ -36,10 +36,6 @@ export default function useImage(editor: Ref<any>, imageToken: Ref<string | unde
 		icon: 'image',
 		tooltip: i18n.global.t('wysiwyg_options.image'),
 		onAction: (buttonApi: any) => {
-			if (editor.value.plugins.fullscreen.isFullscreen()) {
-				editor.value.execCommand('mceFullScreen');
-			}
-
 			imageDrawerOpen.value = true;
 
 			if (buttonApi.isActive()) {
diff --git a/app/src/interfaces/input-rich-text-html/useMedia.ts b/app/src/interfaces/input-rich-text-html/useMedia.ts
index 77491f7c49..1fc4820eec 100644
--- a/app/src/interfaces/input-rich-text-html/useMedia.ts
+++ b/app/src/interfaces/input-rich-text-html/useMedia.ts
@@ -45,10 +45,6 @@ export default function useMedia(editor: Ref<any>, imageToken: Ref<string | unde
 		icon: 'embed',
 		tooltip: i18n.global.t('wysiwyg_options.media'),
 		onAction: (buttonApi: any) => {
-			if (editor.value.plugins.fullscreen.isFullscreen()) {
-				editor.value.execCommand('mceFullScreen');
-			}
-
 			mediaDrawerOpen.value = true;
 
 			if (buttonApi.isActive()) {
diff --git a/app/src/interfaces/input-rich-text-html/useSourceCode.ts b/app/src/interfaces/input-rich-text-html/useSourceCode.ts
index 1ac169c13a..e120fd0d82 100644
--- a/app/src/interfaces/input-rich-text-html/useSourceCode.ts
+++ b/app/src/interfaces/input-rich-text-html/useSourceCode.ts
@@ -23,10 +23,6 @@ export default function useSourceCode(editor: Ref<any>): UsableSourceCode {
 		icon: 'sourcecode',
 		tooltip: i18n.global.t('wysiwyg_options.source_code'),
 		onAction: () => {
-			if (editor.value.plugins.fullscreen.isFullscreen()) {
-				editor.value.execCommand('mceFullScreen');
-			}
-
 			codeDrawerOpen.value = true;
 			code.value = editor.value.getContent();
 		},