diff --git a/src/container/styles.scss b/src/container/styles.scss
index c37e6a61aa..252c614612 100644
--- a/src/container/styles.scss
+++ b/src/container/styles.scss
@@ -256,12 +256,15 @@
   flex: 1;
   &-fit-height {
     overflow: auto;
-    display: flex;
-    flex-direction: column;
+    display: grid;
+    grid-template-rows: 1fr;
+    grid-template-columns: minmax(0, 1fr);
   }
 }
 .content-inner {
-  flex: 1;
+  block-size: 100%;
+  min-block-size: 0;
+  min-inline-size: 0;
 
   &.with-paddings {
     padding-block: awsui.$space-scaled-l;