diff --git a/ui/app/AppLayouts/Wallet/panels/TokenSettingsModalContent.qml b/ui/app/AppLayouts/Wallet/panels/TokenSettingsModalContent.qml
index 9f401c6ff5..0b584e49aa 100644
--- a/ui/app/AppLayouts/Wallet/panels/TokenSettingsModalContent.qml
+++ b/ui/app/AppLayouts/Wallet/panels/TokenSettingsModalContent.qml
@@ -17,7 +17,7 @@ Item {
     property var customTokenList
     signal toggleVisibleClicked(string symbol)
     signal removeCustomTokenTriggered(string address)
-    signal tokenDetailsTriggered(string address, string name, string symbol, string decimals)
+    signal showTokenDetailsTriggered(string address, string name, string symbol, string decimals)
 
     SearchBox {
         id: searchBox
@@ -103,7 +103,7 @@ Item {
                         //% "Token details"
                         text: qsTrId("token-details")
                         onTriggered: {
-                            modalBody.tokenDetailsTriggered(address, name, symbol, decimals);
+                            modalBody.showTokenDetailsTriggered(address, name, symbol, decimals);
                         }
                     }
                     Action {
diff --git a/ui/app/AppLayouts/Wallet/panels/WalletHeader.qml b/ui/app/AppLayouts/Wallet/panels/WalletHeader.qml
index 92996e3ada..a65fed4b9b 100644
--- a/ui/app/AppLayouts/Wallet/panels/WalletHeader.qml
+++ b/ui/app/AppLayouts/Wallet/panels/WalletHeader.qml
@@ -99,12 +99,6 @@ Item {
             onClosed: {
                 destroy();
             }
-            onAddCustomTokenTriggered: {
-                addCustomTokenModal.openEditable();
-            }
-            onTokenDetailsTriggered: {
-                addCustomTokenModal.openWithData(address, name, symbol, decimals);
-            }
         }
     }
 
@@ -116,10 +110,6 @@ Item {
         }
     }
 
-    AddCustomTokenModal{
-        id: addCustomTokenModal
-    }
-
     Item {
         property int btnOuterMargin: Style.current.bigPadding
         id: walletMenu
diff --git a/ui/app/AppLayouts/Wallet/popups/AddCustomTokenModal.qml b/ui/app/AppLayouts/Wallet/popups/AddShowTokenModal.qml
similarity index 100%
rename from ui/app/AppLayouts/Wallet/popups/AddCustomTokenModal.qml
rename to ui/app/AppLayouts/Wallet/popups/AddShowTokenModal.qml
diff --git a/ui/app/AppLayouts/Wallet/popups/TokenSettingsModal.qml b/ui/app/AppLayouts/Wallet/popups/TokenSettingsModal.qml
index 9b768c5b34..6f8f72cf7f 100644
--- a/ui/app/AppLayouts/Wallet/popups/TokenSettingsModal.qml
+++ b/ui/app/AppLayouts/Wallet/popups/TokenSettingsModal.qml
@@ -14,9 +14,7 @@ ModalPopup {
     id: popup
     //% "Manage Assets"
     title: qsTrId("manage-assets")
-    signal addCustomTokenTriggered()
-    signal tokenDetailsTriggered(string address, string address, string address, string address)
-
+    
     TokenSettingsModalContent {
         id: settingsModalContent
         anchors.left: parent.left
@@ -34,8 +32,12 @@ ModalPopup {
         onRemoveCustomTokenTriggered: {
             RootStore.removeCustomToken(address)
         }
-        onTokenDetailsTriggered: {
-            popup.tokenDetailsTriggered(address, name, symbol, decimals);
+        onShowTokenDetailsTriggered: {
+            addShowTokenModal.openWithData(address, name, symbol, decimals);
+        }
+
+        AddShowTokenModal{
+           id: addShowTokenModal
         }
     }
 
@@ -45,7 +47,9 @@ ModalPopup {
         text: qsTrId("add-custom-token")
         anchors.top: parent.top
         onClicked: {
-            popup.addCustomTokenTriggered();
+            addShowTokenModal.openEditable();
         }
     }
+    
+    
 }