diff --git a/SAS/TMSS/frontend/tmss_webapp/src/layout/_overrides.scss b/SAS/TMSS/frontend/tmss_webapp/src/layout/_overrides.scss
index c395c8127779d3bcd8f458914ac6b301da478a1e..17c54f381bc4ccedaceaa3894ee19db63236bd21 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/layout/_overrides.scss
+++ b/SAS/TMSS/frontend/tmss_webapp/src/layout/_overrides.scss
@@ -22,6 +22,7 @@
     border-top: none;
    }
 }
+
 .ag-root-wrapper{
     /*
         calendar is overlaped by AG-grid table, so table props update to show calendar
@@ -31,6 +32,7 @@
 .tmss-table {
  overflow:auto;
  min-height: 400px;
+ max-height: calc(#{$vh * 100} - 20.3em)
   // since calendar getting inserted to table, because of above overflow, not getting visible
    // so its hacky one based on calendar height
   // padding-top: 350px;
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/layout/sass/_main.scss b/SAS/TMSS/frontend/tmss_webapp/src/layout/sass/_main.scss
index e398654e2b1549cb2ba49e395eefc9aac26014ec..de8329fc4b57badd6817132396dbde1f67b2156c 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/layout/sass/_main.scss
+++ b/SAS/TMSS/frontend/tmss_webapp/src/layout/sass/_main.scss
@@ -35,3 +35,6 @@ a {
     color: lightgray !important;
 }
 
+.app {
+    height: 100vh;
+}
\ No newline at end of file