diff --git a/Yattee/Views/Instances/InstanceBrowseView.swift b/Yattee/Views/Instances/InstanceBrowseView.swift
index d08484e7..173bdf4c 100644
--- a/Yattee/Views/Instances/InstanceBrowseView.swift
+++ b/Yattee/Views/Instances/InstanceBrowseView.swift
@@ -553,7 +553,18 @@ struct InstanceBrowseView: View {
             }
             #endif
 
-            // Content type segmented picker
+            // Content type picker
+            #if os(tvOS)
+            filterMenu(
+                title: String(localized: "search.filters.type"),
+                selection: Binding(
+                    get: { searchViewModel?.filters.type ?? .video },
+                    set: { searchViewModel?.filters.type = $0 }
+                ),
+                options: SearchContentType.allCases,
+                labelForOption: { $0.title }
+            )
+            #else
             Picker("", selection: Binding(
                 get: { searchViewModel?.filters.type ?? .video },
                 set: { searchViewModel?.filters.type = $0 }
@@ -563,6 +574,7 @@ struct InstanceBrowseView: View {
                 }
             }
             .pickerStyle(.segmented)
+            #endif
         }
         .padding(.horizontal)
         .padding(.vertical, 8)
diff --git a/Yattee/Views/Search/SearchView.swift b/Yattee/Views/Search/SearchView.swift
index e2c0667d..ec40311a 100644
--- a/Yattee/Views/Search/SearchView.swift
+++ b/Yattee/Views/Search/SearchView.swift
@@ -425,7 +425,18 @@ struct SearchView: View {
             }
             #endif
 
-            // Content type segmented picker
+            // Content type picker
+            #if os(tvOS)
+            filterMenu(
+                title: String(localized: "search.filters.type"),
+                selection: Binding(
+                    get: { searchViewModel?.filters.type ?? .video },
+                    set: { searchViewModel?.filters.type = $0 }
+                ),
+                options: SearchContentType.allCases,
+                labelForOption: { $0.title }
+            )
+            #else
             Picker("", selection: Binding(
                 get: { searchViewModel?.filters.type ?? .video },
                 set: { searchViewModel?.filters.type = $0 }
@@ -435,6 +446,7 @@ struct SearchView: View {
                 }
             }
             .pickerStyle(.segmented)
+            #endif
         }
         .padding(.horizontal)
         .padding(.vertical, 8)