diff --git a/StickerSlack/SwiftUI/ContentView.swift b/StickerSlack/SwiftUI/ContentView.swift
index e07b8fd..6ca2f14 100644
--- a/StickerSlack/SwiftUI/ContentView.swift
+++ b/StickerSlack/SwiftUI/ContentView.swift
@@ -53,7 +53,6 @@ struct ContentView: View {
 					SearchView(hoarder: hoarder)
 				}
 			}
-			.searchable(text: $hoarder.searchTerm)
 		} else {
 			TabView {
 				DownloadedView(hoarder: hoarder)
@@ -73,7 +72,6 @@ struct ContentView: View {
 						Label("Search", systemImage: "magnifyingglass")
 					}
 			}
-			.searchable(text: $hoarder.searchTerm)
 		}
 	}
 }
diff --git a/StickerSlack/SwiftUI/SearchView.swift b/StickerSlack/SwiftUI/SearchView.swift
index 972019d..9910ada 100644
--- a/StickerSlack/SwiftUI/SearchView.swift
+++ b/StickerSlack/SwiftUI/SearchView.swift
@@ -10,19 +10,22 @@ import SwiftUI
 struct SearchView: View {
 	@ObservedObject var hoarder: EmojiHoarder
 	
-    var body: some View {
-		List {
-			Text("\(hoarder.searchTerm.isEmpty ? hoarder.emojis.count : hoarder.filteredEmojis.count) Emoji")
-			
-			ForEach(hoarder.filteredEmojis, id: \.self) { name in
-				if let emoji = hoarder.trie.dict[name] {
-					EmojiRow(hoarder: hoarder, emoji: emoji)
+	var body: some View {
+		NavigationStack {
+			List {
+				Text("\(hoarder.searchTerm.isEmpty ? hoarder.emojis.count : hoarder.filteredEmojis.count) Emoji")
+				
+				ForEach(hoarder.filteredEmojis, id: \.self) { name in
+					if let emoji = hoarder.trie.dict[name] {
+						EmojiRow(hoarder: hoarder, emoji: emoji)
+					}
 				}
 			}
+			.onChange(of: hoarder.searchTerm) { _ in
+				hoarder.filterEmojis(by: hoarder.searchTerm)
+			}
 		}
-		.onChange(of: hoarder.searchTerm) { _ in
-			hoarder.filterEmojis(by: hoarder.searchTerm)
-		}
+		.searchable(text: $hoarder.searchTerm)
 	}
 }