diff --git a/packages/openbridge-webcomponents/__vis__/linux/__baselines__/components/modal-window/modal-window.stories.ts/large-auto.png b/packages/openbridge-webcomponents/__vis__/linux/__baselines__/components/modal-window/modal-window.stories.ts/large-auto.png
index acc3fdfcc..fbffa06d7 100644
Binary files a/packages/openbridge-webcomponents/__vis__/linux/__baselines__/components/modal-window/modal-window.stories.ts/large-auto.png and b/packages/openbridge-webcomponents/__vis__/linux/__baselines__/components/modal-window/modal-window.stories.ts/large-auto.png differ
diff --git a/packages/openbridge-webcomponents/__vis__/linux/__baselines__/components/modal-window/modal-window.stories.ts/large-without-optional-action-auto.png b/packages/openbridge-webcomponents/__vis__/linux/__baselines__/components/modal-window/modal-window.stories.ts/large-without-optional-action-auto.png
index cf1bdf232..f867743fb 100644
Binary files a/packages/openbridge-webcomponents/__vis__/linux/__baselines__/components/modal-window/modal-window.stories.ts/large-without-optional-action-auto.png and b/packages/openbridge-webcomponents/__vis__/linux/__baselines__/components/modal-window/modal-window.stories.ts/large-without-optional-action-auto.png differ
diff --git a/packages/openbridge-webcomponents/__vis__/linux/__baselines__/components/modal-window/modal-window.stories.ts/medium-auto.png b/packages/openbridge-webcomponents/__vis__/linux/__baselines__/components/modal-window/modal-window.stories.ts/medium-auto.png
index 7b152e70f..c2be8dba3 100644
Binary files a/packages/openbridge-webcomponents/__vis__/linux/__baselines__/components/modal-window/modal-window.stories.ts/medium-auto.png and b/packages/openbridge-webcomponents/__vis__/linux/__baselines__/components/modal-window/modal-window.stories.ts/medium-auto.png differ
diff --git a/packages/openbridge-webcomponents/__vis__/linux/__baselines__/components/modal-window/modal-window.stories.ts/medium-without-optional-action-auto.png b/packages/openbridge-webcomponents/__vis__/linux/__baselines__/components/modal-window/modal-window.stories.ts/medium-without-optional-action-auto.png
index 074d04aa4..7d09ea7c6 100644
Binary files a/packages/openbridge-webcomponents/__vis__/linux/__baselines__/components/modal-window/modal-window.stories.ts/medium-without-optional-action-auto.png and b/packages/openbridge-webcomponents/__vis__/linux/__baselines__/components/modal-window/modal-window.stories.ts/medium-without-optional-action-auto.png differ
diff --git a/packages/openbridge-webcomponents/__vis__/linux/__baselines__/components/modal-window/modal-window.stories.ts/small-auto.png b/packages/openbridge-webcomponents/__vis__/linux/__baselines__/components/modal-window/modal-window.stories.ts/small-auto.png
index 2d03f142c..915276bd1 100644
Binary files a/packages/openbridge-webcomponents/__vis__/linux/__baselines__/components/modal-window/modal-window.stories.ts/small-auto.png and b/packages/openbridge-webcomponents/__vis__/linux/__baselines__/components/modal-window/modal-window.stories.ts/small-auto.png differ
diff --git a/packages/openbridge-webcomponents/__vis__/linux/__baselines__/components/modal-window/modal-window.stories.ts/small-without-optional-action-auto.png b/packages/openbridge-webcomponents/__vis__/linux/__baselines__/components/modal-window/modal-window.stories.ts/small-without-optional-action-auto.png
index 824ce49ea..97e521a78 100644
Binary files a/packages/openbridge-webcomponents/__vis__/linux/__baselines__/components/modal-window/modal-window.stories.ts/small-without-optional-action-auto.png and b/packages/openbridge-webcomponents/__vis__/linux/__baselines__/components/modal-window/modal-window.stories.ts/small-without-optional-action-auto.png differ
diff --git a/packages/openbridge-webcomponents/__vis__/linux/__baselines__/components/modal-window/modal-window.stories.ts/without-cancel-and-close-auto.png b/packages/openbridge-webcomponents/__vis__/linux/__baselines__/components/modal-window/modal-window.stories.ts/without-cancel-and-close-auto.png
index 2dde0d1f4..59cd2c45b 100644
Binary files a/packages/openbridge-webcomponents/__vis__/linux/__baselines__/components/modal-window/modal-window.stories.ts/without-cancel-and-close-auto.png and b/packages/openbridge-webcomponents/__vis__/linux/__baselines__/components/modal-window/modal-window.stories.ts/without-cancel-and-close-auto.png differ
diff --git a/packages/openbridge-webcomponents/__vis__/linux/__baselines__/components/modal-window/modal-window.stories.ts/without-cancel-auto.png b/packages/openbridge-webcomponents/__vis__/linux/__baselines__/components/modal-window/modal-window.stories.ts/without-cancel-auto.png
index 44990a5e4..2a9ca6342 100644
Binary files a/packages/openbridge-webcomponents/__vis__/linux/__baselines__/components/modal-window/modal-window.stories.ts/without-cancel-auto.png and b/packages/openbridge-webcomponents/__vis__/linux/__baselines__/components/modal-window/modal-window.stories.ts/without-cancel-auto.png differ
diff --git a/packages/openbridge-webcomponents/__vis__/linux/__baselines__/components/modal-window/modal-window.stories.ts/without-close-auto.png b/packages/openbridge-webcomponents/__vis__/linux/__baselines__/components/modal-window/modal-window.stories.ts/without-close-auto.png
index 73bb6ce19..37eb6e7c1 100644
Binary files a/packages/openbridge-webcomponents/__vis__/linux/__baselines__/components/modal-window/modal-window.stories.ts/without-close-auto.png and b/packages/openbridge-webcomponents/__vis__/linux/__baselines__/components/modal-window/modal-window.stories.ts/without-close-auto.png differ
diff --git a/packages/openbridge-webcomponents/__vis__/linux/__baselines__/components/modal-window/modal-window.stories.ts/without-leading-icon-auto.png b/packages/openbridge-webcomponents/__vis__/linux/__baselines__/components/modal-window/modal-window.stories.ts/without-leading-icon-auto.png
index 2b8b86aae..0566ef9f3 100644
Binary files a/packages/openbridge-webcomponents/__vis__/linux/__baselines__/components/modal-window/modal-window.stories.ts/without-leading-icon-auto.png and b/packages/openbridge-webcomponents/__vis__/linux/__baselines__/components/modal-window/modal-window.stories.ts/without-leading-icon-auto.png differ
diff --git a/packages/openbridge-webcomponents/src/components/modal-window/modal-window.css b/packages/openbridge-webcomponents/src/components/modal-window/modal-window.css
index c04466b06..79a68b19c 100644
--- a/packages/openbridge-webcomponents/src/components/modal-window/modal-window.css
+++ b/packages/openbridge-webcomponents/src/components/modal-window/modal-window.css
@@ -13,7 +13,7 @@
   display: flex;
   flex-direction: column;
   width: 100%;
-  height: 407px;
+  max-height: 90vh;
 }
 
 .title-container {
@@ -64,7 +64,9 @@
 }
 
 .content-area {
-  flex: 1 0 0;
+  flex: 1 1 auto;
+  min-height: 0;
+  overflow-y: auto;
 }
 
 .action-container {