diff --git a/Gem/Assets/Navigation/SelectAssetSceneNavigationStack.swift b/Gem/Assets/Navigation/SelectAssetSceneNavigationStack.swift
index 4875e0af..ccf28088 100644
--- a/Gem/Assets/Navigation/SelectAssetSceneNavigationStack.swift
+++ b/Gem/Assets/Navigation/SelectAssetSceneNavigationStack.swift
@@ -38,23 +38,20 @@ struct SelectAssetSceneNavigationStack: View {
                         .accessibilityIdentifier("cancel")
                     }
                     if model.showAddToken {
-                        
-                        if model.showFiltering {
-                            ToolbarItem(placement: .navigationBarTrailing) {
-                                Button {
-                                    isPresentingFilteringView = true
-                                } label: {
-                                    if model.filterModel.isCusomFilteringSpecified {
-                                        Image(systemName: SystemImage.filterFill)
-                                            .symbolRenderingMode(.palette)
-                                            .foregroundStyle(Colors.whiteSolid, Colors.blue)
-                                    } else {
-                                        Image(systemName: SystemImage.filter)
-                                            .foregroundStyle(.primary)
-                                    }
+                        ToolbarItem(placement: .navigationBarTrailing) {
+                            Button {
+                                isPresentingFilteringView = true
+                            } label: {
+                                if model.filterModel.isCusomFilteringSpecified {
+                                    Image(systemName: SystemImage.filterFill)
+                                        .symbolRenderingMode(.palette)
+                                        .foregroundStyle(Colors.whiteSolid, Colors.blue)
+                                } else {
+                                    Image(systemName: SystemImage.filter)
+                                        .foregroundStyle(.primary)
                                 }
-                                .contentTransition(.symbolEffect(.replace))
                             }
+                            .contentTransition(.symbolEffect(.replace))
                         }
 
                         ToolbarItem(placement: .navigationBarTrailing) {
diff --git a/Gem/Assets/ViewModels/AssetsFilterViewModel.swift b/Gem/Assets/ViewModels/AssetsFilterViewModel.swift
index e962df11..17ee61d7 100644
--- a/Gem/Assets/ViewModels/AssetsFilterViewModel.swift
+++ b/Gem/Assets/ViewModels/AssetsFilterViewModel.swift
@@ -7,7 +7,8 @@ import Settings
 
 struct AssetsFilterViewModel {
     private let type: SelectAssetType
-    let allChains: [Chain] = AssetConfiguration.allChains
+
+    let allChains: [Chain]
 
     var assetsRequest: AssetsRequest
 
@@ -25,6 +26,7 @@ struct AssetsFilterViewModel {
     }
 
     init(wallet: Wallet, type: SelectAssetType) {
+        self.allChains = WalletSupportedChains(wallet: wallet).sortedByRank
         self.assetsRequest = AssetsRequest(
             walletID: wallet.id,
             filters: Self.defaultFilters(type: type)
diff --git a/Gem/Assets/ViewModels/SelectAssetViewModel.swift b/Gem/Assets/ViewModels/SelectAssetViewModel.swift
index b01b8a96..e2dd6eef 100644
--- a/Gem/Assets/ViewModels/SelectAssetViewModel.swift
+++ b/Gem/Assets/ViewModels/SelectAssetViewModel.swift
@@ -54,10 +54,6 @@ class SelectAssetViewModel {
     var showAddToken: Bool {
         selectType == .manage && !walletChains.isEmpty
     }
-
-    var showFiltering: Bool {
-        selectType == .manage && walletChains.hasMany
-    }
 }
 
 // MARK: - Business Logic