diff --git a/Model/NavigationModel.swift b/Model/NavigationModel.swift
index 11dff244..06770bb3 100644
--- a/Model/NavigationModel.swift
+++ b/Model/NavigationModel.swift
@@ -93,6 +93,7 @@ final class NavigationModel: ObservableObject {
             return
         }
 
+        navigation.hideKeyboard()
         player.hide()
         navigation.presentingChannel = false
 
@@ -130,6 +131,8 @@ final class NavigationModel: ObservableObject {
             player.hide()
         #endif
 
+        navigation.hideKeyboard()
+
         DispatchQueue.main.asyncAfter(deadline: .now() + 0.2) {
             recents.add(recent)
 
@@ -156,6 +159,8 @@ final class NavigationModel: ObservableObject {
         navigation.presentingPlaylist = false
         navigation.tabSelection = .search
 
+        navigation.hideKeyboard()
+
         if let searchQuery = searchQuery {
             let recent = RecentItem(from: searchQuery)
             recents.add(recent)
diff --git a/Model/Player/PlayerModel.swift b/Model/Player/PlayerModel.swift
index c95a0c5d..4a195f44 100644
--- a/Model/Player/PlayerModel.swift
+++ b/Model/Player/PlayerModel.swift
@@ -202,6 +202,8 @@ final class PlayerModel: ObservableObject {
             }
         #endif
 
+        navigation.hideKeyboard()
+
         DispatchQueue.main.async { [weak self] in
             withAnimation(.linear(duration: 0.25)) {
                 self?.presentingPlayer = true