diff --git a/components/AccountModal/index.scss b/components/AccountModal/index.scss
index c8135020..fda20060 100644
--- a/components/AccountModal/index.scss
+++ b/components/AccountModal/index.scss
@@ -3,6 +3,7 @@
   flex-direction: column;
   gap: $unit-2x;
   width: $unit * 64;
+  overflow-y: hidden;
 
   .Fields {
     display: flex;
diff --git a/components/AccountModal/index.tsx b/components/AccountModal/index.tsx
index 52677f06..c10ee25c 100644
--- a/components/AccountModal/index.tsx
+++ b/components/AccountModal/index.tsx
@@ -87,6 +87,7 @@ const AccountModal = (props: Props) => {
 
   // Refs
   const headerRef = React.createRef<HTMLDivElement>()
+  const footerRef = React.createRef<HTMLDivElement>()
 
   // UI management
   function openChange(open: boolean) {
@@ -290,6 +291,7 @@ const AccountModal = (props: Props) => {
       <DialogContent
         className="Account"
         headerref={headerRef}
+        footerref={footerRef}
         onOpenAutoFocus={(event: Event) => {}}
         onEscapeKeyDown={onEscapeKeyDown}
       >
@@ -314,7 +316,7 @@ const AccountModal = (props: Props) => {
             {languageField()}
             {themeField()}
           </div>
-          <div className="DialogFooter">
+          <div className="DialogFooter" ref={footerRef}>
             <Button
               contained={true}
               text={t('modals.settings.buttons.confirm')}