diff --git a/src/components/Editor.vue b/src/components/Editor.vue
index 65fecbc09a..58e0ad9d78 100644
--- a/src/components/Editor.vue
+++ b/src/components/Editor.vue
@@ -807,6 +807,7 @@ export default {
 </style>
 
 <style lang="scss">
+	@import './../css/variables';
 	@import './../css/style';
 	@import './../css/print';
 
diff --git a/src/components/ViewerComponent.vue b/src/components/ViewerComponent.vue
index 6f8f21c618..6ea05d7b9e 100644
--- a/src/components/ViewerComponent.vue
+++ b/src/components/ViewerComponent.vue
@@ -29,7 +29,12 @@
 		:share-token="shareToken"
 		:mime="mime"
 		:show-outline-outside="showOutlineOutside" />
-	<Component :is="readerComponent" v-else :content="content" />
+	<div v-else
+		id="editor-container"
+		data-text-el="editor-container"
+		class="text-editor source-viewer">
+		<Component :is="readerComponent" :content="content" />
+	</div>
 </template>
 
 <script>
@@ -102,6 +107,9 @@ export default {
 	},
 
 	watch: {
+		source() {
+			this.loadFileContent()
+		},
 		active() {
 			this.loadFileContent()
 		},
@@ -120,7 +128,7 @@ export default {
 
 	methods: {
 		async loadFileContent() {
-			if (!this.isEditable && this.content === '') {
+			if (!this.isEditable) {
 				const response = await axios.get(this.source)
 				this.content = response.data
 				this.contentLoaded = true
@@ -131,15 +139,34 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-.text-editor {
+.text-editor:not(.viewer__file--hidden) {
 	overflow: scroll;
+	top: 0;
+	width: 100%;
+	max-width: 100%;
+	height: 100%;
+	left: 0;
+	margin: 0 auto;
+	position: relative;
+	background-color: var(--color-main-background);
+
+	&.source-viewer {
+		.text-editor__content-wrapper {
+			margin-top: var(--header-height);
+		}
+	}
 }
 </style>
 <style lang="scss">
+@import './../css/variables';
 @media only screen and (max-width: 512px) {
 	// on mobile, modal-container has top: 50px
 	.text-editor {
 		top: auto;
 	}
 }
+
+.viewer[data-handler='text'] .modal-wrapper .modal-container {
+	bottom: 0;
+}
 </style>
diff --git a/src/css/style.scss b/src/css/style.scss
index 3f035ae51c..734f42c24c 100644
--- a/src/css/style.scss
+++ b/src/css/style.scss
@@ -1,12 +1,6 @@
 @use 'sass:math';
 
-:root {
-	--text-editor-max-width: 670px
-}
-
-.modal-container .text-editor {
-	position: absolute;
-}
+@import './variables';
 
 .ProseMirror-hideselection {
 	caret-color: transparent;
diff --git a/src/css/variables.scss b/src/css/variables.scss
new file mode 100644
index 0000000000..01845b035b
--- /dev/null
+++ b/src/css/variables.scss
@@ -0,0 +1,4 @@
+:root {
+	--text-editor-max-width: 670px
+}
+