diff --git a/src/view/Office.vue b/src/view/Office.vue
index f27ae502d0..52afac179b 100644
--- a/src/view/Office.vue
+++ b/src/view/Office.vue
@@ -532,11 +532,20 @@ export default {
 </style>
 
 <style lang="scss">
-.viewer .office-viewer:not(.viewer__file--hidden) {
+.viewer__content:not(.viewer--split) .office-viewer:not(.viewer__file--hidden):not(.widget-file) {
 	width: 100%;
 	height: 100vh;
 	height: 100dvh;
 	top: -50px;
 	position: absolute;
 }
+
+[data-handler='richdocuments'] .modal-container {
+	bottom: 0;
+}
+
+.viewer__content.viewer--split .office-viewer {
+	height: 100%;
+	width: 100%;
+}
 </style>
diff --git a/src/viewer.js b/src/viewer.js
index 2db04e99a8..60066c7f8a 100644
--- a/src/viewer.js
+++ b/src/viewer.js
@@ -35,7 +35,7 @@ if (OCA.Viewer) {
 		group: null,
 		mimes: supportedMimes,
 		component: Office,
-		theme: 'light',
+		theme: 'default',
 		canCompare: true,
 	})
 }