diff --git a/projects/components/src/table/table.component.scss b/projects/components/src/table/table.component.scss
index 2af64297a..377085761 100644
--- a/projects/components/src/table/table.component.scss
+++ b/projects/components/src/table/table.component.scss
@@ -1,11 +1,18 @@
 @import 'mixins';
 @import 'layout';
 
-.table {
+.table-container {
   position: relative;
   display: flex;
   flex-direction: column;
-  flex: 1 1;
+  height: 100%;
+  width: 100%;
+}
+
+.table {
+  display: flex;
+  flex-direction: column;
+  flex: 1 1 0;
   height: 100%;
   width: 100%;
   overflow: auto;
@@ -116,6 +123,7 @@
 .pagination-controls {
   position: fixed;
   width: 100%;
+  height: #{$paginator-height};
   bottom: 0;
   background: white;
 }
diff --git a/projects/components/src/table/table.component.ts b/projects/components/src/table/table.component.ts
index 988828bf7..04ea29ebc 100644
--- a/projects/components/src/table/table.component.ts
+++ b/projects/components/src/table/table.component.ts
@@ -59,7 +59,7 @@ import { TableColumnConfigExtended, TableService } from './table.service';
   styleUrls: ['./table.component.scss'],
   changeDetection: ChangeDetectionStrategy.OnPush,
   template: `
-    <div class="table">
+    <div class="table-container">
       <cdk-table
         *ngIf="this.dataSource"
         [multiTemplateDataRows]="this.isDetailType()"