diff --git a/src/app/components/home/user-home/user-home.component.html b/src/app/components/home/user-home/user-home.component.html
index 76d66b8ac3abda63f2383dfb8e76c98fb908607f..73b3f2bfb2ce646b375218683724a2a1f60ac35e 100644
--- a/src/app/components/home/user-home/user-home.component.html
+++ b/src/app/components/home/user-home/user-home.component.html
@@ -2,7 +2,7 @@
   <div fxLayout="row" fxLayoutAlign="center" fxLayoutGap="15px">
     <app-room-join></app-room-join>
   </div>
-  <div fxLayout="row" fxLayoutAlign="center" fxLayoutGap="15px">
+  <div fxLayout="row" fxLayoutAlign="center" class="button-container">
     <button class="focus_button" mat-raised-button (click)="openCreateRoomDialog()" id="create_session-button">
       <mat-icon>add</mat-icon>
       {{ 'home-page.create-session' | translate }}
diff --git a/src/app/components/home/user-home/user-home.component.scss b/src/app/components/home/user-home/user-home.component.scss
index 431eac72505b0b3abeb97f4a9f6a1c2868736add..a723f9f5541a65da9d5a90a3f14ba8fff9144a47 100644
--- a/src/app/components/home/user-home/user-home.component.scss
+++ b/src/app/components/home/user-home/user-home.component.scss
@@ -13,3 +13,7 @@ app-room-list {
   background: var(--on-surface);
   color: var(--background);
 }
+
+.button-container {
+  margin-bottom: 3% !important;
+}
diff --git a/src/app/components/shared/room-list/room-list.component.html b/src/app/components/shared/room-list/room-list.component.html
index 2ebb6b21bd5cdfe5c46583cc401ded9baadb12fc..161628765a036e63fbe7c8ca9035a3fce72980c6 100644
--- a/src/app/components/shared/room-list/room-list.component.html
+++ b/src/app/components/shared/room-list/room-list.component.html
@@ -20,7 +20,7 @@
       <mat-placeholder class="placeholder">{{ 'room-list.filter-message' | translate }}</mat-placeholder>
     </mat-form-field>
 
-    <div [class.tableOverflow]="this.tableDataSource.data.length > 5">
+    <div class="table-container">
       <table #roomTable mat-table [dataSource]="tableDataSource" style="width: 100%">
 
         <!-- Room / Session name column -->
diff --git a/src/app/components/shared/room-list/room-list.component.scss b/src/app/components/shared/room-list/room-list.component.scss
index 676e66b84eaa0867f476897664ef09a2041d52ce..dce2b8b588c2c7c1c8175bcf9a42249f6b118305 100644
--- a/src/app/components/shared/room-list/room-list.component.scss
+++ b/src/app/components/shared/room-list/room-list.component.scss
@@ -66,3 +66,8 @@ th {
   background: var(--secondary);
   color: var(--on-secondary);
 }
+
+.table-container {
+  height: 45vh;
+  overflow: auto;
+}