diff --git a/submodules/LocationUI/Sources/LocationViewController.swift b/submodules/LocationUI/Sources/LocationViewController.swift
index 14c9f3642f..14920a2593 100644
--- a/submodules/LocationUI/Sources/LocationViewController.swift
+++ b/submodules/LocationUI/Sources/LocationViewController.swift
@@ -204,6 +204,8 @@ public final class LocationViewController: ViewController {
                             }
                         }
                     })
+                    
+                    strongSelf.dismissAllTooltips()
                     strongSelf.present(
                         UndoOverlayController(
                             presentationData: strongSelf.presentationData,
@@ -280,6 +282,7 @@ public final class LocationViewController: ViewController {
                                     text = strongSelf.presentationData.strings.Location_ProximityAlertSetTextGroup(distanceString).0
                                 }
                                 
+                                strongSelf.dismissAllTooltips()
                                 strongSelf.present(
                                     UndoOverlayController(
                                         presentationData: strongSelf.presentationData,
@@ -354,6 +357,7 @@ public final class LocationViewController: ViewController {
                             text = strongSelf.presentationData.strings.Location_ProximityAlertSetTextGroup(distanceString).0
                         }
                         
+                        strongSelf.dismissAllTooltips()
                         strongSelf.present(
                             UndoOverlayController(
                                 presentationData: strongSelf.presentationData,
@@ -450,6 +454,15 @@ public final class LocationViewController: ViewController {
         
     }
     
+    private func dismissAllTooltips() {
+        self.forEachController({ controller in
+            if let controller = controller as? UndoOverlayController {
+                controller.dismissWithCommitAction()
+            }
+            return true
+        })
+    }
+    
     override public func loadDisplayNode() {
         super.loadDisplayNode()
         guard let interaction = self.interaction else {