diff --git a/ui/app/AppLayouts/Wallet/panels/SearchableCollectiblesPanel.qml b/ui/app/AppLayouts/Wallet/panels/SearchableCollectiblesPanel.qml
index 17d9d34c93..79b7078602 100644
--- a/ui/app/AppLayouts/Wallet/panels/SearchableCollectiblesPanel.qml
+++ b/ui/app/AppLayouts/Wallet/panels/SearchableCollectiblesPanel.qml
@@ -53,6 +53,8 @@ Control {
     contentItem: StackView {
         id: collectiblesStackView
 
+        implicitHeight: currentItem.implicitHeight
+
         initialItem: ColumnLayout {
             spacing: 0
 
diff --git a/ui/app/AppLayouts/Wallet/panels/TokenSelectorPanel.qml b/ui/app/AppLayouts/Wallet/panels/TokenSelectorPanel.qml
index 1a9aa6b8ad..1459c00065 100644
--- a/ui/app/AppLayouts/Wallet/panels/TokenSelectorPanel.qml
+++ b/ui/app/AppLayouts/Wallet/panels/TokenSelectorPanel.qml
@@ -72,28 +72,27 @@ Control {
             }
         }
 
-        StackLayout {
-            Layout.maximumHeight: 400
+        SearchableAssetsPanel {
+            id: searchableAssetsPanel
 
-            visible: !!root.assetsModel || !!root.collectiblesModel
-            currentIndex: tabBar.currentIndex
+            visible: tabBar.currentIndex === TokenSelectorPanel.Tabs.Assets
+                     && !!root.assetsModel
+            Layout.fillWidth: true
+            Layout.fillHeight: true
 
-            SearchableAssetsPanel {
-                id: searchableAssetsPanel
+            onSelected: root.assetSelected(key)
+        }
 
-                Layout.preferredHeight: visible ? implicitHeight : 0
+        SearchableCollectiblesPanel {
+            id: searchableCollectiblesPanel
 
-                onSelected: root.assetSelected(key)
-            }
+            visible: tabBar.currentIndex === TokenSelectorPanel.Tabs.Collectibles
+                     && !!root.collectiblesModel
+            Layout.fillWidth: true
+            Layout.fillHeight: true
 
-            SearchableCollectiblesPanel {
-                id: searchableCollectiblesPanel
-
-                Layout.preferredHeight: visible ? currentItem.implicitHeight : 0
-
-                onCollectibleSelected: root.collectibleSelected(key)
-                onCollectionSelected: root.collectionSelected(key)
-            }
+            onCollectibleSelected: root.collectibleSelected(key)
+            onCollectionSelected: root.collectionSelected(key)
         }
     }
 }