diff --git a/packages/desktop-client/src/components/MobileWebMessage.tsx b/packages/desktop-client/src/components/MobileWebMessage.tsx
index 8d73f22d0fd..ae4b17ebaac 100644
--- a/packages/desktop-client/src/components/MobileWebMessage.tsx
+++ b/packages/desktop-client/src/components/MobileWebMessage.tsx
@@ -51,7 +51,7 @@ export function MobileWebMessage() {
         left: 0,
         right: 0,
         backgroundColor: theme.menuAutoCompleteBackground,
-        color: theme.modalText,
+        color: theme.menuAutoCompleteText,
         padding: 10,
         margin: 10,
         borderRadius: 6,
diff --git a/packages/desktop-client/src/components/common/Modal.tsx b/packages/desktop-client/src/components/common/Modal.tsx
index e8339d82318..c44931d36eb 100644
--- a/packages/desktop-client/src/components/common/Modal.tsx
+++ b/packages/desktop-client/src/components/common/Modal.tsx
@@ -174,7 +174,6 @@ export const Modal = ({
               padding: 20,
               position: 'relative',
               flexShrink: 0,
-              color: theme.modalText,
             }}
           >
             <View
diff --git a/packages/desktop-client/src/components/modals/AccountAutocompleteModal.tsx b/packages/desktop-client/src/components/modals/AccountAutocompleteModal.tsx
index 59fae73cb28..3db3104f884 100644
--- a/packages/desktop-client/src/components/modals/AccountAutocompleteModal.tsx
+++ b/packages/desktop-client/src/components/modals/AccountAutocompleteModal.tsx
@@ -32,6 +32,9 @@ export function AccountAutocompleteModal({
   return (
     <Modal
       title="Account"
+      titleStyle={{
+        color: theme.menuAutoCompleteText,
+      }}
       noAnimation={!isNarrowWidth}
       showHeader={isNarrowWidth}
       focusAfterClose={false}
@@ -53,7 +56,7 @@ export function AccountAutocompleteModal({
               title="Account"
               style={{
                 alignSelf: 'center',
-                color: theme.modalText,
+                color: theme.menuAutoCompleteText,
                 marginBottom: 10,
               }}
             />
diff --git a/packages/desktop-client/src/components/modals/CategoryAutocompleteModal.tsx b/packages/desktop-client/src/components/modals/CategoryAutocompleteModal.tsx
index 51a66395959..886bd221a68 100644
--- a/packages/desktop-client/src/components/modals/CategoryAutocompleteModal.tsx
+++ b/packages/desktop-client/src/components/modals/CategoryAutocompleteModal.tsx
@@ -33,6 +33,9 @@ export function CategoryAutocompleteModal({
   return (
     <Modal
       title="Category"
+      titleStyle={{
+        color: theme.menuAutoCompleteText,
+      }}
       noAnimation={!isNarrowWidth}
       showHeader={isNarrowWidth}
       focusAfterClose={false}
@@ -54,7 +57,7 @@ export function CategoryAutocompleteModal({
               title="Category"
               style={{
                 alignSelf: 'center',
-                color: theme.modalText,
+                color: theme.menuAutoCompleteText,
                 marginBottom: 10,
               }}
             />
diff --git a/packages/desktop-client/src/components/modals/EditField.jsx b/packages/desktop-client/src/components/modals/EditField.jsx
index 641c186391c..4d0b06465cd 100644
--- a/packages/desktop-client/src/components/modals/EditField.jsx
+++ b/packages/desktop-client/src/components/modals/EditField.jsx
@@ -278,9 +278,7 @@ export function EditField({ modalProps, name, onSubmit, onClose }) {
         padding: '15px 10px',
         borderRadius: '6px',
         ...(minWidth && { minWidth }),
-        ...(!isNarrowWidth && {
-          backgroundColor: theme.menuAutoCompleteBackground,
-        }),
+        backgroundColor: theme.menuAutoCompleteBackground,
       }}
     >
       {() => (
@@ -290,7 +288,7 @@ export function EditField({ modalProps, name, onSubmit, onClose }) {
               title={label}
               style={{
                 alignSelf: 'center',
-                color: theme.modalText,
+                color: theme.menuAutoCompleteText,
                 marginBottom: 10,
               }}
             />
diff --git a/packages/desktop-client/src/components/modals/PayeeAutocompleteModal.tsx b/packages/desktop-client/src/components/modals/PayeeAutocompleteModal.tsx
index 4873d42a490..64a4e25115d 100644
--- a/packages/desktop-client/src/components/modals/PayeeAutocompleteModal.tsx
+++ b/packages/desktop-client/src/components/modals/PayeeAutocompleteModal.tsx
@@ -35,6 +35,9 @@ export function PayeeAutocompleteModal({
   return (
     <Modal
       title="Payee"
+      titleStyle={{
+        color: theme.menuAutoCompleteText,
+      }}
       noAnimation={!isNarrowWidth}
       showHeader={isNarrowWidth}
       focusAfterClose={false}
diff --git a/packages/desktop-client/src/style/themes/dark.ts b/packages/desktop-client/src/style/themes/dark.ts
index b7b5831d9b3..81b756b8dc5 100644
--- a/packages/desktop-client/src/style/themes/dark.ts
+++ b/packages/desktop-client/src/style/themes/dark.ts
@@ -63,7 +63,6 @@ export const menuAutoCompleteText = colorPalette.navy200;
 export const menuAutoCompleteTextHeader = colorPalette.purple200;
 export const menuAutoCompleteItemText = menuItemText;
 
-export const modalText = colorPalette.white;
 export const modalBackground = colorPalette.gray800;
 export const modalBorder = colorPalette.navy600;
 export const mobileHeaderBackground = colorPalette.purple800;
diff --git a/packages/desktop-client/src/style/themes/development.ts b/packages/desktop-client/src/style/themes/development.ts
index 46cd0fa4401..c8a47c85eba 100644
--- a/packages/desktop-client/src/style/themes/development.ts
+++ b/packages/desktop-client/src/style/themes/development.ts
@@ -63,7 +63,6 @@ export const menuAutoCompleteText = colorPalette.white;
 export const menuAutoCompleteTextHeader = colorPalette.orange150;
 export const menuAutoCompleteItemText = menuAutoCompleteText;
 
-export const modalText = colorPalette.white;
 export const modalBackground = colorPalette.white;
 export const modalBorder = colorPalette.white;
 export const mobileHeaderBackground = colorPalette.purple400;
diff --git a/packages/desktop-client/src/style/themes/light.ts b/packages/desktop-client/src/style/themes/light.ts
index c0a3c4da424..37549803de4 100644
--- a/packages/desktop-client/src/style/themes/light.ts
+++ b/packages/desktop-client/src/style/themes/light.ts
@@ -65,7 +65,6 @@ export const menuAutoCompleteTextHeader = colorPalette.orange150;
 export const menuAutoCompleteItemTextHover = menuAutoCompleteText;
 export const menuAutoCompleteItemText = menuAutoCompleteText;
 
-export const modalText = colorPalette.white;
 export const modalBackground = colorPalette.white;
 export const modalBorder = colorPalette.white;
 export const mobileHeaderBackground = colorPalette.purple400;
diff --git a/packages/desktop-client/src/style/themes/midnight.ts b/packages/desktop-client/src/style/themes/midnight.ts
index 2adeacc4435..cb6a41e7271 100644
--- a/packages/desktop-client/src/style/themes/midnight.ts
+++ b/packages/desktop-client/src/style/themes/midnight.ts
@@ -64,7 +64,6 @@ export const menuAutoCompleteTextHover = colorPalette.green900;
 export const menuAutoCompleteTextHeader = colorPalette.purple200;
 export const menuAutoCompleteItemTextHover = colorPalette.gray700;
 export const menuAutoCompleteItemText = menuItemText;
-export const modalText = colorPalette.white;
 export const modalBackground = colorPalette.gray700;
 export const modalBorder = colorPalette.gray200;
 export const mobileHeaderBackground = colorPalette.gray900;