diff --git a/src/components/Table/Table.module.scss b/src/components/Table/Table.module.scss
index 3cc10c205..a5b8153ed 100644
--- a/src/components/Table/Table.module.scss
+++ b/src/components/Table/Table.module.scss
@@ -1,7 +1,5 @@
 .container {
   position: relative;
-  width: 100%;
-  height: 100%;
 
   .loading-mask {
     display: flex;
@@ -54,4 +52,8 @@
       }
     }
   }
+
+  &.full-height {
+    height: 100%;
+  }
 }
diff --git a/src/components/Table/Table.tsx b/src/components/Table/Table.tsx
index f57acb469..f2e9ee174 100644
--- a/src/components/Table/Table.tsx
+++ b/src/components/Table/Table.tsx
@@ -104,6 +104,13 @@ const Table: FC<TableProps> = ({
   useFixedTableLayout = false,
   truncateOverflow = false,
 }) => {
+  const containerClasses = classNames(
+    styles.container,
+    {
+      [styles['full-height']]: !!isScrollable?.y,
+    },
+  );
+
   const scrollContainerClasses = classNames(
     styles['scroll-container'],
     {
@@ -125,7 +132,7 @@ const Table: FC<TableProps> = ({
   );
 
   return (
-    <div className={styles.container}>
+    <div className={containerClasses}>
       {isLoading && (
         <div className={styles['loading-mask']}>
           <Spinner size="xl" />