From 1d1deaab2a10ea527732404be9a36c18e21e35cc Mon Sep 17 00:00:00 2001
From: Echo <ChaosExAnima@users.noreply.github.com>
Date: Thu, 23 Apr 2026 10:28:14 +0200
Subject: [PATCH] Profile editing: Fix overflow in advanced view (#38791)

---
 .../mastodon/features/account_edit/components/column.tsx | 6 +++---
 .../mastodon/features/account_edit/styles.module.scss    | 9 ++++-----
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/app/javascript/mastodon/features/account_edit/components/column.tsx b/app/javascript/mastodon/features/account_edit/components/column.tsx
index 9fb83e444c..dde7436887 100644
--- a/app/javascript/mastodon/features/account_edit/components/column.tsx
+++ b/app/javascript/mastodon/features/account_edit/components/column.tsx
@@ -23,7 +23,7 @@ export const AccountEditEmptyColumn: FC<{
   }
 
   return (
-    <Column bindToDocument={!multiColumn} className={classes.column}>
+    <Column bindToDocument={!multiColumn}>
       <LoadingIndicator />
     </Column>
   );
@@ -38,7 +38,7 @@ export const AccountEditColumn: FC<{
 
   return (
     <>
-      <Column bindToDocument={!multiColumn} className={classes.column}>
+      <Column bindToDocument={!multiColumn}>
         <ColumnHeader
           title={title}
           className={classes.columnHeader}
@@ -53,7 +53,7 @@ export const AccountEditColumn: FC<{
           }
         />
 
-        {children}
+        <div className='scrollable'>{children}</div>
       </Column>
       <Helmet>
         <title>{title}</title>
diff --git a/app/javascript/mastodon/features/account_edit/styles.module.scss b/app/javascript/mastodon/features/account_edit/styles.module.scss
index 1ca1e4646c..4991f8e7e5 100644
--- a/app/javascript/mastodon/features/account_edit/styles.module.scss
+++ b/app/javascript/mastodon/features/account_edit/styles.module.scss
@@ -126,11 +126,6 @@
 
 // Column component
 
-.column {
-  border: 1px solid var(--color-border-primary);
-  border-top-width: 0;
-}
-
 .columnHeader {
   :global(.column-header__buttons) {
     align-items: center;
@@ -258,6 +253,10 @@
   padding: 24px;
   border-bottom: 1px solid var(--color-border-primary);
   font-size: 15px;
+
+  &:last-child {
+    border-bottom: none;
+  }
 }
 
 .sectionHeader {