diff --git a/packages/theme/styles/panel.scss b/packages/theme/styles/panel.scss
index 0b0458fd4d..f7c73a4e0c 100644
--- a/packages/theme/styles/panel.scss
+++ b/packages/theme/styles/panel.scss
@@ -345,6 +345,7 @@
   }
 
   .popupPanel-body {
+    overflow: hidden;
     position: relative;
     display: flex;
     min-width: 0;
@@ -363,6 +364,7 @@
       justify-content: center;
     }
     &__main, &__mobile, &__aside {
+      overflow: hidden;
       display: flex;
       flex-direction: column;
       min-width: 0;
@@ -564,6 +566,9 @@
     overflow: visible;
   }
 }
+.popupPanel .popupPanel-body__aside .popupPanel-body__aside-grid + .popupPanel-title {
+  border-top: 1px solid var(--theme-divider-color);
+}
 
 // Full size state
 .popup.fullsize .popupPanel {
diff --git a/plugins/controlled-documents-resources/src/components/document/EditDocContent.svelte b/plugins/controlled-documents-resources/src/components/document/EditDocContent.svelte
index d41106f73d..472ee5fc6c 100644
--- a/plugins/controlled-documents-resources/src/components/document/EditDocContent.svelte
+++ b/plugins/controlled-documents-resources/src/components/document/EditDocContent.svelte
@@ -222,6 +222,8 @@
 
 <style lang="scss">
   .root {
+    overflow: hidden;
+
     @media print {
       margin-left: -1rem;
     }