diff --git a/iphone/Maps/UI/Search/SearchOnMap/SearchOnMapViewController.swift b/iphone/Maps/UI/Search/SearchOnMap/SearchOnMapViewController.swift
index 3af4dba94f..604be50881 100644
--- a/iphone/Maps/UI/Search/SearchOnMap/SearchOnMapViewController.swift
+++ b/iphone/Maps/UI/Search/SearchOnMap/SearchOnMapViewController.swift
@@ -7,6 +7,7 @@ protocol SearchOnMapView: AnyObject {
 @objc
 protocol SearchOnMapScrollViewDelegate: AnyObject {
   func scrollViewDidScroll(_ scrollView: UIScrollView)
+  func scrollViewWillEndDragging(_ scrollView: UIScrollView, withVelocity velocity: CGPoint, targetContentOffset: UnsafeMutablePointer<CGPoint>)
 }
 
 @objc
@@ -463,8 +464,11 @@ extension SearchOnMapViewController: UIGestureRecognizerDelegate {
   }
 
   func gestureRecognizer(_ gestureRecognizer: UIGestureRecognizer, shouldRecognizeSimultaneouslyWith otherGestureRecognizer: UIGestureRecognizer) -> Bool {
-    // threshold is used to soften transition from the internal scroll zero content offset
-    internalScrollViewContentOffset < Constants.panGestureThreshold
+    if gestureRecognizer is UIPanGestureRecognizer && otherGestureRecognizer is UIPanGestureRecognizer {
+      // threshold is used to soften transition from the internal scroll zero content offset
+      return internalScrollViewContentOffset < Constants.panGestureThreshold
+    }
+    return false
   }
 }
 
@@ -480,4 +484,11 @@ extension SearchOnMapViewController: SearchOnMapScrollViewDelegate {
     }
     internalScrollViewContentOffset = scrollView.contentOffset.y
   }
+
+  func scrollViewWillEndDragging(_ scrollView: UIScrollView, withVelocity velocity: CGPoint, targetContentOffset: UnsafeMutablePointer<CGPoint>) {
+    // lock internal scroll view when the user fast scrolls screen to the top
+    if internalScrollViewContentOffset == 0 {
+      targetContentOffset.pointee = .zero
+    }
+  }
 }
diff --git a/iphone/Maps/UI/Search/Tabs/CategoriesTab/SearchCategoriesViewController.swift b/iphone/Maps/UI/Search/Tabs/CategoriesTab/SearchCategoriesViewController.swift
index 4ce8ae6453..ce5abe53e9 100644
--- a/iphone/Maps/UI/Search/Tabs/CategoriesTab/SearchCategoriesViewController.swift
+++ b/iphone/Maps/UI/Search/Tabs/CategoriesTab/SearchCategoriesViewController.swift
@@ -45,6 +45,10 @@ final class SearchCategoriesViewController: MWMTableViewController {
     delegate?.scrollViewDidScroll(scrollView)
   }
 
+  override func scrollViewWillEndDragging(_ scrollView: UIScrollView, withVelocity velocity: CGPoint, targetContentOffset: UnsafeMutablePointer<CGPoint>) {
+    delegate?.scrollViewWillEndDragging(scrollView, withVelocity: velocity, targetContentOffset: targetContentOffset)
+  }
+
   func category(at indexPath: IndexPath) -> String {
     let index = indexPath.row
     return categories[index]
diff --git a/iphone/Maps/UI/Search/Tabs/SearchTabViewController.swift b/iphone/Maps/UI/Search/Tabs/SearchTabViewController.swift
index b770bf063d..2dfe98f800 100644
--- a/iphone/Maps/UI/Search/Tabs/SearchTabViewController.swift
+++ b/iphone/Maps/UI/Search/Tabs/SearchTabViewController.swift
@@ -63,6 +63,10 @@ extension SearchTabViewController: SearchOnMapScrollViewDelegate {
   func scrollViewDidScroll(_ scrollView: UIScrollView) {
     delegate?.scrollViewDidScroll(scrollView)
   }
+
+  func scrollViewWillEndDragging(_ scrollView: UIScrollView, withVelocity velocity: CGPoint, targetContentOffset: UnsafeMutablePointer<CGPoint>) {
+    delegate?.scrollViewWillEndDragging(scrollView, withVelocity: velocity, targetContentOffset: targetContentOffset)
+  }
 }
 
 extension SearchTabViewController: SearchCategoriesViewControllerDelegate {