diff --git a/src/App.vue b/src/App.vue
index be2d4aa8..615412f4 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,7 +1,7 @@
 <template>
-  <div id="app">
+  <div id="app" class="d-flex flex-column vh-100">
     <Header />
-    <Body />
+    <Body class="flex-fill overflow-auto" />
   </div>
 </template>
 
diff --git a/src/components/layout/Body.vue b/src/components/layout/Body.vue
index b798be2a..e220a0dc 100644
--- a/src/components/layout/Body.vue
+++ b/src/components/layout/Body.vue
@@ -1,5 +1,5 @@
 <template>
-  <main class="container-fluid h-100 container-main">
+  <main class="container-fluid container-main">
     <BotAlerts />
     <router-view />
   </main>
