diff --git a/frontend/src/app/main/ui/settings/delete_account.cljs b/frontend/src/app/main/ui/settings/delete_account.cljs
index 37b6aa07ac..4c7dace38a 100644
--- a/frontend/src/app/main/ui/settings/delete_account.cljs
+++ b/frontend/src/app/main/ui/settings/delete_account.cljs
@@ -66,11 +66,12 @@
                  :on-click modal/hide!} deprecated-icon/close]]
 
       [:div {:class (stl/css :modal-content)}
-       [:& context-notification
-        {:level :warning
-         :content (tr (if has-orgs?
-                        "modals.delete-account.info.with-orgs"
-                        "modals.delete-account.info"))}]
+       [:div {:class (stl/css :warning-notice)}
+        [:& context-notification
+         {:level :warning
+          :content (tr (if has-orgs?
+                         "modals.delete-account.info.with-orgs"
+                         "modals.delete-account.info"))}]]
 
        (when has-orgs?
          [:div {:class (stl/css :orgs-section)}
diff --git a/frontend/src/app/main/ui/settings/delete_account.scss b/frontend/src/app/main/ui/settings/delete_account.scss
index 391fa66cfb..cabfea544e 100644
--- a/frontend/src/app/main/ui/settings/delete_account.scss
+++ b/frontend/src/app/main/ui/settings/delete_account.scss
@@ -17,6 +17,8 @@
 .modal-container {
   @extend %modal-container-base;
 
+  display: flex;
+  flex-direction: column;
   min-width: deprecated.$s-408;
 }
 
@@ -38,10 +40,16 @@
   @include deprecated.flex-column;
   @include deprecated.body-small-typography;
 
+  flex: 1 1 auto;
+  min-height: 0;
   gap: deprecated.$s-24;
   margin-bottom: deprecated.$s-24;
 }
 
+.warning-notice {
+  flex-shrink: 0;
+}
+
 .fields-row {
   @include deprecated.flex-column;
 }
@@ -57,6 +65,8 @@
 
   display: flex;
   flex-direction: column;
+  flex: 1 1 auto;
+  min-height: 0;
   gap: var(--sp-l);
 }
 
@@ -87,10 +97,13 @@
 .org-list {
   display: flex;
   flex-direction: column;
+  flex: 1 1 auto;
+  min-height: 0;
   gap: var(--sp-l);
   margin: 0;
   padding: 0;
   list-style: none;
+  overflow-y: auto;
 }
 
 .org-item {