diff --git a/iphone/Maps/UI/Search/Tabs/CategoriesTab/SearchCategoriesViewController.swift b/iphone/Maps/UI/Search/Tabs/CategoriesTab/SearchCategoriesViewController.swift
index f920c99a26..5ddbb9ab74 100644
--- a/iphone/Maps/UI/Search/Tabs/CategoriesTab/SearchCategoriesViewController.swift
+++ b/iphone/Maps/UI/Search/Tabs/CategoriesTab/SearchCategoriesViewController.swift
@@ -29,6 +29,7 @@ final class SearchCategoriesViewController: MWMTableViewController {
     tableView.register(cellClass: SearchCategoryCell.self)
     tableView.register(cellClass: SearchBannerCell.self)
     tableView.separatorStyle = .none
+    tableView.keyboardDismissMode = .onDrag
   }
   
   override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
diff --git a/iphone/Maps/UI/Search/Tabs/HistoryTab/SearchHistoryViewController.swift b/iphone/Maps/UI/Search/Tabs/HistoryTab/SearchHistoryViewController.swift
index 4f77484448..71ac0f4e1a 100644
--- a/iphone/Maps/UI/Search/Tabs/HistoryTab/SearchHistoryViewController.swift
+++ b/iphone/Maps/UI/Search/Tabs/HistoryTab/SearchHistoryViewController.swift
@@ -33,6 +33,7 @@ final class SearchHistoryViewController: MWMViewController {
       let nib = UINib(nibName: "SearchHistoryClearCell", bundle: nil)
       tableView.register(nib, forCellReuseIdentifier: SearchHistoryViewController.clearCellIdentifier)
     }
+    tableView.keyboardDismissMode = .onDrag
   }
   
   func showNoResultsView() {