diff --git a/packages/desktop-client/src/components/accounts/TransactionsTable.js b/packages/desktop-client/src/components/accounts/TransactionsTable.js
index 2d25cbe8423ec1a18330fe8e2857228a35c1cd27..ba9599821fcb34c1f899f5e01bc23b9447131bc1 100644
--- a/packages/desktop-client/src/components/accounts/TransactionsTable.js
+++ b/packages/desktop-client/src/components/accounts/TransactionsTable.js
@@ -762,6 +762,7 @@ export const Transaction = React.memo(function Transaction(props) {
             <AccountAutocomplete
               value={accountId}
               accounts={accounts}
+              includeClosedAccounts
               shouldSaveFromKey={shouldSaveFromKey}
               tableBehavior={true}
               focused={true}
diff --git a/packages/desktop-client/src/components/util/GenericInput.js b/packages/desktop-client/src/components/util/GenericInput.js
index 8d8c6aeaf030295ae471f118296d2e13ee83cdb4..4813dd8a48d55936cce6fdb5ca3b4fcc8d0db462 100644
--- a/packages/desktop-client/src/components/util/GenericInput.js
+++ b/packages/desktop-client/src/components/util/GenericInput.js
@@ -66,6 +66,7 @@ export default function GenericInput({
           content = (
             <AccountAutocomplete
               accounts={accounts}
+              includeClosedAccounts
               value={value}
               multi={multi}
               openOnFocus={false}
diff --git a/packages/loot-design/src/components/AccountAutocomplete.js b/packages/loot-design/src/components/AccountAutocomplete.js
index cc600521b8ef221042c8b11ab5cbdd9e09b695f6..7b2acadd31a36be673c9da5dba0c75521eb42798 100644
--- a/packages/loot-design/src/components/AccountAutocomplete.js
+++ b/packages/loot-design/src/components/AccountAutocomplete.js
@@ -66,7 +66,11 @@ export function AccountList({
   );
 }
 
-export default function AccountAutocomplete({ embedded, ...props }) {
+export default function AccountAutocomplete({
+  embedded,
+  includeClosedAccounts = false,
+  ...props
+}) {
   let accounts = useCachedAccounts() || [];
 
   return (
@@ -74,7 +78,11 @@ export default function AccountAutocomplete({ embedded, ...props }) {
       strict={true}
       highlightFirst={true}
       embedded={embedded}
-      suggestions={accounts}
+      suggestions={
+        includeClosedAccounts
+          ? accounts
+          : accounts.filter(a => a.closed === false)
+      }
       renderItems={(items, getItemProps, highlightedIndex) => (
         <AccountList
           items={items}
diff --git a/packages/loot-design/src/components/modals/EditField.js b/packages/loot-design/src/components/modals/EditField.js
index 9b0277d6814aebff0c43318b749029b48d2d4311..a9c2208c5427de343813d2d489d56dc482f9ccd3 100644
--- a/packages/loot-design/src/components/modals/EditField.js
+++ b/packages/loot-design/src/components/modals/EditField.js
@@ -72,6 +72,7 @@ function EditField({
         <AccountAutocomplete
           value={null}
           accounts={accounts}
+          includeClosedAccounts
           focused={true}
           embedded={true}
           onSelect={value => {