diff --git a/ui/app/AppLayouts/Wallet/WalletLayout.qml b/ui/app/AppLayouts/Wallet/WalletLayout.qml
index 34ab6e9511..90e9505501 100644
--- a/ui/app/AppLayouts/Wallet/WalletLayout.qml
+++ b/ui/app/AppLayouts/Wallet/WalletLayout.qml
@@ -261,7 +261,11 @@ Item {
                 d.swapFormData.selectedNetworkChainId = StatusQUtils.ModelUtils.getByKey(RootStore.filteredFlatModel, "layer", 1, "chainId")
                 d.swapFormData.fromTokensKey = tokensKey
                 d.swapFormData.defaultToTokenKey = RootStore.areTestNetworksEnabled ? Constants.swap.testStatusTokenKey : Constants.swap.mainnetStatusTokenKey
-                Global.openSwapModalRequested(d.swapFormData)
+                Global.openSwapModalRequested(d.swapFormData, (popup) => {
+                    popup.Component.destruction.connect(() => {
+                        d.swapFormData.resetFormData()
+                    })
+                })
             }
             onDappListRequested: root.dappListRequested()
             onDappConnectRequested: root.dappConnectRequested()
@@ -389,7 +393,11 @@ Item {
                     d.swapFormData.fromTokensKey =  walletStore.currentViewedHoldingTokensKey
                 }
                 d.swapFormData.defaultToTokenKey = RootStore.areTestNetworksEnabled ? Constants.swap.testStatusTokenKey : Constants.swap.mainnetStatusTokenKey
-                Global.openSwapModalRequested(d.swapFormData)
+                Global.openSwapModalRequested(d.swapFormData, (popup) => {
+                    popup.Component.destruction.connect(() => {
+                        d.swapFormData.resetFormData()
+                    })
+                })
             }
             onLaunchBuyCryptoModal: d.launchBuyCryptoModal()
 
diff --git a/ui/app/mainui/Popups.qml b/ui/app/mainui/Popups.qml
index 7c1a0b9b6d..54d247176b 100644
--- a/ui/app/mainui/Popups.qml
+++ b/ui/app/mainui/Popups.qml
@@ -406,8 +406,8 @@ QtObject {
         })
     }
 
-    function openSwapModal(parameters) {
-        openPopup(swapModal, {swapInputParamsForm: parameters})
+    function openSwapModal(parameters, callback) {
+        openPopup(swapModal, {swapInputParamsForm: parameters}, callback)
     }
 
     function openBuyCryptoModal(parameters) {
@@ -1267,7 +1267,10 @@ QtObject {
                     swapOutputData: SwapOutputData{}
                 }
                 loginType: root.rootStore.loginType
-                onClosed: destroy()
+                onClosed: {
+                    destroy()
+                    swapInputParamsForm.resetFormData()
+                }
             }
         },
         Component {
diff --git a/ui/imports/utils/Global.qml b/ui/imports/utils/Global.qml
index 61a478ac91..f6039f9870 100644
--- a/ui/imports/utils/Global.qml
+++ b/ui/imports/utils/Global.qml
@@ -91,7 +91,7 @@ QtObject {
     signal openPaymentRequestModalRequested(var callback)
 
     // Swap
-    signal openSwapModalRequested(var formDataParams)
+    signal openSwapModalRequested(var formDataParams, var callback)
 
     // BuyCrypto
     signal openBuyCryptoModalRequested(var formDataParams)