diff --git a/src/components/account/AccountForm/AccountForm.css b/src/components/account/AccountForm/AccountForm.css
index e5fe48b..7918661 100644
--- a/src/components/account/AccountForm/AccountForm.css
+++ b/src/components/account/AccountForm/AccountForm.css
@@ -6,6 +6,7 @@
   display: flex;
   flex-direction: column;
   height: 100%;
+  min-height: 0;
   padding: 0;
   background-color: var(--color-bg);
   border-radius: 20px;
@@ -291,7 +292,7 @@
   .account-form {
     padding: 0;
     max-width: 100%;
-    height: 100vh;
+    height: 100%;
     border-radius: 0;
   }
 
diff --git a/src/pages/Accounts/Accounts.css b/src/pages/Accounts/Accounts.css
index e505e94..d48a897 100644
--- a/src/pages/Accounts/Accounts.css
+++ b/src/pages/Accounts/Accounts.css
@@ -301,6 +301,13 @@
   animation: slideUp 0.3s cubic-bezier(0.16, 1, 0.3, 1);
 }
 
+.accounts-page__modal--fixed {
+  display: flex;
+  flex-direction: column;
+  overflow: hidden;
+  padding: 0;
+}
+
 /* Delete Confirmation */
 .accounts-page__delete-confirm {
   padding: var(--spacing-xl);
diff --git a/src/pages/Accounts/Accounts.tsx b/src/pages/Accounts/Accounts.tsx
index a1947a1..ea015ad 100644
--- a/src/pages/Accounts/Accounts.tsx
+++ b/src/pages/Accounts/Accounts.tsx
@@ -250,7 +250,7 @@ export const Accounts: React.FC = () => {
       {/* Modal Overlay */}
       {modalType !== 'none' && (
         <div className="accounts-page__modal-overlay" onClick={closeModal}>
-          <div className="accounts-page__modal" onClick={(e) => e.stopPropagation()}>
+          <div className={`accounts-page__modal ${modalType === 'create' || modalType === 'edit' ? 'accounts-page__modal--fixed' : ''}`} onClick={(e) => e.stopPropagation()}>
             {/* Create Account Modal */}
             {modalType === 'create' && (
               <AccountForm
diff --git a/src/pages/Home/Home.tsx b/src/pages/Home/Home.tsx
index 7abe508..dd862f2 100644
--- a/src/pages/Home/Home.tsx
+++ b/src/pages/Home/Home.tsx
@@ -405,7 +405,7 @@ function Home() {
       <CreateFirstAccountModal isOpen={!loading && !error && accounts.length === 0 && !showAccountForm} onCreate={() => setShowAccountForm(true)} />
       {showAccountForm && (
         <div className="modal-overlay">
-          <div className="modal-content">
+          <div className="modal-content" style={{ display: 'flex', flexDirection: 'column', maxHeight: '90vh', overflow: 'hidden', padding: 0 }}>
             <AccountForm
               onSubmit={async (data) => { await createAccount(data); setShowAccountForm(false); await loadData(); }}
               onCancel={() => setShowAccountForm(false)}