diff --git a/client/web/admin/src/app.js b/client/web/admin/src/app.js
index 1691b135b..b58849f04 100644
--- a/client/web/admin/src/app.js
+++ b/client/web/admin/src/app.js
@@ -21,7 +21,7 @@ export default (options = {}) => {
   options = {
     el: '#app',
     name: 'admin',
-    template: '<div><router-view v-if="loaded && i18nLoaded && isRbacLoaded" /></div>',
+    template: '<router-view v-if="loaded && i18nLoaded && isRbacLoaded" />',
 
     mixins: [
       mixins.corredor,
diff --git a/client/web/admin/src/views/Layout.vue b/client/web/admin/src/views/Layout.vue
index 061343a2b..52be7ad44 100644
--- a/client/web/admin/src/views/Layout.vue
+++ b/client/web/admin/src/views/Layout.vue
@@ -1,8 +1,6 @@
 <template>
-  <div class="d-flex flex-column w-100 vh-100">
-    <header
-      class="mw-100"
-    >
+  <div class="d-flex flex-column w-100 vh-100 overflow-hidden">
+    <header>
       <c-topbar
         :sidebar-pinned="pinned"
         :settings="$Settings.get('ui.topbar', {})"
diff --git a/client/web/compose/src/app.js b/client/web/compose/src/app.js
index 4226edbcd..4474174f3 100644
--- a/client/web/compose/src/app.js
+++ b/client/web/compose/src/app.js
@@ -21,7 +21,7 @@ export default (options = {}) => {
   options = {
     el: '#app',
     name: 'compose',
-    template: '<div><router-view v-if="loaded && i18nLoaded" /></div>',
+    template: '<router-view v-if="loaded && i18nLoaded" />',
 
     mixins: [
       mixins.corredor,
diff --git a/client/web/compose/src/views/Layout.vue b/client/web/compose/src/views/Layout.vue
index cfdf41090..f09d197f1 100644
--- a/client/web/compose/src/views/Layout.vue
+++ b/client/web/compose/src/views/Layout.vue
@@ -1,8 +1,6 @@
 <template>
-  <div class="d-flex flex-column w-100 vh-100">
-    <header
-      class="mw-100"
-    >
+  <div class="d-flex flex-column w-100 vh-100 overflow-hidden">
+    <header>
       <c-topbar
         :sidebar-pinned="pinned"
         :settings="$Settings.get('ui.topbar', {})"
@@ -70,10 +68,13 @@
       </template>
       <router-view />
     </main>
+
     <c-prompts />
+
     <c-toaster
       :toasts="toasts"
     />
+
     <c-permissions-modal
       :labels="{
         save: $t('permissions:ui.save'),
@@ -102,6 +103,7 @@
         },
       }"
     />
+
     <c-translation-modal />
   </div>
 </template>
diff --git a/client/web/discovery/src/views/Layout.vue b/client/web/discovery/src/views/Layout.vue
index 05508ceb2..22f476e8a 100644
--- a/client/web/discovery/src/views/Layout.vue
+++ b/client/web/discovery/src/views/Layout.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="d-flex flex-column w-100 vh-100">
+  <div class="d-flex flex-column w-100 vh-100 overflow-hidden">
     <header>
       <c-topbar
         :sidebar-pinned="pinned"
diff --git a/client/web/one/src/app.js b/client/web/one/src/app.js
index 09a91ec8a..9df8140df 100644
--- a/client/web/one/src/app.js
+++ b/client/web/one/src/app.js
@@ -15,7 +15,7 @@ export default (options = {}) => {
   options = {
     el: '#app',
     name: 'one',
-    template: '<div v-if="loaded && i18nLoaded"><router-view/></div>',
+    template: '<router-view v-if="loaded && i18nLoaded" />',
 
     data: () => ({
       loaded: false,
diff --git a/client/web/one/src/views/Layout.vue b/client/web/one/src/views/Layout.vue
index 522bd31bb..008e993b4 100644
--- a/client/web/one/src/views/Layout.vue
+++ b/client/web/one/src/views/Layout.vue
@@ -1,10 +1,7 @@
 <template>
-  <div
-    class="d-flex flex-column w-100 vh-100"
-  >
+  <div class="d-flex flex-column w-100 vh-100 overflow-hidden">
     <header
       v-show="loaded"
-      class="mw-100"
     >
       <c-topbar
         hide-app-selector
diff --git a/client/web/privacy/src/app.js b/client/web/privacy/src/app.js
index 81dd32a00..7a2e1ad46 100644
--- a/client/web/privacy/src/app.js
+++ b/client/web/privacy/src/app.js
@@ -17,7 +17,7 @@ export default (options = {}) => {
     el: '#app',
     name: 'privacy',
 
-    template: '<div v-if="loaded && i18nLoaded" class="h-100"><router-view/></div>',
+    template: '<router-view v-if="loaded && i18nLoaded" />',
 
     data: () => ({
       loaded: false,
diff --git a/client/web/reporter/src/app.js b/client/web/reporter/src/app.js
index 554c2ea67..1295ab73b 100644
--- a/client/web/reporter/src/app.js
+++ b/client/web/reporter/src/app.js
@@ -18,7 +18,7 @@ export default (options = {}) => {
     el: '#app',
     name: 'reporter',
 
-    template: '<div v-if="loaded && i18nLoaded" class="h-100"><router-view/></div>',
+    template: '<router-view v-if="loaded && i18nLoaded" />',
 
     data: () => ({
       loaded: false,
diff --git a/client/web/reporter/src/views/Layout.vue b/client/web/reporter/src/views/Layout.vue
index c77a2a69c..5d94902ef 100644
--- a/client/web/reporter/src/views/Layout.vue
+++ b/client/web/reporter/src/views/Layout.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="d-flex flex-column w-100 vh-100">
+  <div class="d-flex flex-column w-100 vh-100 overflow-hidden">
     <header>
       <c-topbar
         :sidebar-pinned="pinned"
diff --git a/client/web/workflow/src/app.js b/client/web/workflow/src/app.js
index 467b830d3..a5851ae29 100644
--- a/client/web/workflow/src/app.js
+++ b/client/web/workflow/src/app.js
@@ -16,7 +16,7 @@ export default (options = {}) => {
   options = {
     el: '#app',
     name: 'workflow',
-    template: '<div v-if="loaded && i18nLoaded" class="h-100"><router-view/></div>',
+    template: '<router-view v-if="loaded && i18nLoaded" />',
 
     data: () => ({
       loaded: false,
diff --git a/client/web/workflow/src/views/Layout.vue b/client/web/workflow/src/views/Layout.vue
index da7f57838..e1f43d704 100644
--- a/client/web/workflow/src/views/Layout.vue
+++ b/client/web/workflow/src/views/Layout.vue
@@ -1,8 +1,6 @@
 <template>
-  <div class="d-flex flex-column w-100 vh-100">
-    <header
-      class="mw-100"
-    >
+  <div class="d-flex flex-column w-100 vh-100 overflow-hidden">
+    <header>
       <c-topbar
         :sidebar-pinned="pinned"
         :settings="$Settings.get('ui.topbar', {})"