diff --git a/cms/static/sass/elements/_modal-window.scss b/cms/static/sass/elements/_modal-window.scss
index 7ac046a89aa8..d00ebcbd413c 100644
--- a/cms/static/sass/elements/_modal-window.scss
+++ b/cms/static/sass/elements/_modal-window.scss
@@ -406,43 +406,43 @@
     display: flex;
     flex-direction: column;
 
-
-    // Set the components to flex so that they can grow
-    div,
-    form {
+    div.edit-xblock-modal {
       display: flex;
       flex-direction: column;
       flex-grow: 1;
 
-      // Set the header to not grow
-      header,
-      &.modal-header {
-        flex-grow: 0;
-      }
+      div.modal-content {
+        display: flex;
+        flex-direction: column;
+        flex-grow: 1;
+        padding: 0;
 
-    }
+        div.xblock-editor {
+          display: flex;
+          flex-direction: column;
+          flex-grow: 1;
 
-    ul {
-      flex-grow: 1;
+          div.xblock-studio_view {
+            display: flex;
+            flex-direction: column;
+            flex-grow: 1;
+          }
 
-      // Reset the divs inside the ul to preserve previous styling
-      div,
-      form {
-        display: unset;
-        flex-direction: unset;
-        flex-grow: unset;
-      }
-    }
+          div.editor-with-buttons {
+            display: flex;
+            flex-direction: column;
+            flex-grow: 1;
+            margin-bottom: 0;
 
-    &.modal-editor {
-      .modal-content {
-        padding: 0px;
+            ul.settings-list {
+              flex-grow: 1;
+            }
+          }
+        }
       }
     }
   }
 
-
-
   // specific modal overrides
   // ------------------------