diff --git a/src/status/libstatus/wallet.nim b/src/status/libstatus/wallet.nim
index e8e4167b6c..dfac7d414a 100644
--- a/src/status/libstatus/wallet.nim
+++ b/src/status/libstatus/wallet.nim
@@ -84,7 +84,7 @@ proc validateMnemonic*(mnemonic: string): string =
   result = $nim_status.validateMnemonic(mnemonic)
 
 proc startWallet*() =
-  discard nim_status.startWallet(true)
+  discard nim_status.startWallet() # TODO: true  to watch trx
 
 proc hex2Token*(input: string, decimals: int): string =
   var value = fromHex(Stuint[256], input)
diff --git a/ui/app/AppLayouts/Wallet/WalletHeader.qml b/ui/app/AppLayouts/Wallet/WalletHeader.qml
index 7ebeb7c5c3..0847c418a9 100644
--- a/ui/app/AppLayouts/Wallet/WalletHeader.qml
+++ b/ui/app/AppLayouts/Wallet/WalletHeader.qml
@@ -66,6 +66,9 @@ Item {
     Component {
         id: receiveModalComponent
         ReceiveModal{
+            onClosed: {
+                destroy();
+            }
             selectedAccount: currentAccount
         }
     }
@@ -73,18 +76,27 @@ Item {
     Component {
         id: setCurrencyModalComponent
         SetCurrencyModal{
+            onClosed: {
+                destroy();
+            }
         }
     }
 
     Component {
         id: tokenSettingsModalComponent
         TokenSettingsModal{
+            onClosed: {
+                destroy();
+            }
         }
     }
 
     Component {
         id: accountSettingsModalComponent
         AccountSettingsModal{
+            onClosed: {
+                destroy();
+            }
             changeSelectedAccount: walletHeader.changeSelectedAccount
         }
     }