diff --git a/src/components/EditorWrapper.vue b/src/components/EditorWrapper.vue
index ebdb7cc777b..4be93361a1c 100644
--- a/src/components/EditorWrapper.vue
+++ b/src/components/EditorWrapper.vue
@@ -570,6 +570,8 @@ export default {
 			#editor {
 				padding-top: 50px;
 				overflow: auto;
+				// Fix for IE11 issue where the menubar sometimes was positioned under the text
+				z-index: 1000;
 			}
 			.has-conflicts #editor {
 				padding-top: 0px;
diff --git a/src/views/RichWorkspace.vue b/src/views/RichWorkspace.vue
index eef934b2fa7..cb142332e17 100644
--- a/src/views/RichWorkspace.vue
+++ b/src/views/RichWorkspace.vue
@@ -199,6 +199,7 @@ export default {
 	#rich-workspace::v-deep #editor-container {
 		height: 100%;
 		position: unset !important;
+		top: auto !important;
 	}
 
 	#rich-workspace::v-deep #editor-wrapper {
@@ -262,4 +263,38 @@ export default {
 		}
 	}
 
+	html.ie {
+		#rich-workspace::v-deep {
+			#editor-container {
+				position: initial;
+			}
+
+			#editor-wrapper {
+				position: relative !important;
+				top: auto !important;
+			}
+
+			#editor {
+				display: flex;
+				flex-direction: column;
+				overflow: hidden !important;
+			}
+
+			.menubar {
+				position: relative;
+				overflow: hidden;
+				flex-shrink: 0;
+				height: 44px;
+				top: auto;
+			}
+
+			#editor > div:nth-child(2) {
+				min-height: 44px;
+				overflow-x: hidden;
+				overflow-y: auto;
+				flex-shrink: 1;
+			}
+		}
+	}
+
 </style>