diff --git a/drape_frontend/frontend_renderer.cpp b/drape_frontend/frontend_renderer.cpp
index cdcdd63640..da28ad8f08 100755
--- a/drape_frontend/frontend_renderer.cpp
+++ b/drape_frontend/frontend_renderer.cpp
@@ -1357,7 +1357,11 @@ void FrontendRenderer::ProcessSelection(ref_ptr<SelectObjectMessage> msg)
     {
       m2::PointD startPosition;
       m_selectionShape->IsVisible(modelView, startPosition);
-      m_selectionTrackInfo = SelectionTrackInfo(modelView.GlobalRect(), startPosition);
+      
+      if (msg->GetSelectedObject() == SelectionShape::ESelectedObject::OBJECT_GUIDE)
+        m_selectionTrackInfo.reset();
+      else
+        m_selectionTrackInfo = SelectionTrackInfo(modelView.GlobalRect(), startPosition);
     }
 
     if (msg->IsGeometrySelectionAllowed())
diff --git a/iphone/Maps/Classes/MapViewController.mm b/iphone/Maps/Classes/MapViewController.mm
index 0af2777f7c..180efdfb74 100644
--- a/iphone/Maps/Classes/MapViewController.mm
+++ b/iphone/Maps/Classes/MapViewController.mm
@@ -610,7 +610,6 @@ NSString *const kPP2BookmarkEditingSegue = @"PP2BookmarkEditing";
       alert.onViewBlock = ^{
         [self dismissViewControllerAnimated:YES completion:nil];
         [self.navigationController popToRootViewControllerAnimated:YES];
-        GetFramework().DeactivateMapSelection(true);
         GetFramework().ShowBookmarkCategory(categoryId);
       };
       alert.onCancelBlock = ^{