diff --git a/Shared/Search/SearchView.swift b/Shared/Search/SearchView.swift
index 7070bdc3..c60bf577 100644
--- a/Shared/Search/SearchView.swift
+++ b/Shared/Search/SearchView.swift
@@ -311,7 +311,11 @@ struct SearchView: View {
         Button {
             switch item.type {
             case .query:
-                queryText = item.title
+                #if os(tvOS)
+                    state.queryText = item.title
+                #else
+                    queryText = item.title
+                #endif
                 state.changeQuery { query in query.query = item.title }
 
                 updateFavoriteItem()
@@ -351,6 +355,9 @@ struct SearchView: View {
         .contextMenu {
             removeButton(item)
             removeAllButton
+            #if os(tvOS)
+                Button("Cancel", role: .cancel) {}
+            #endif
         }
     }