diff --git a/iphone/Maps/Bookmarks/BookmarksSection.mm b/iphone/Maps/Bookmarks/BookmarksSection.mm
index 57468e688e..b82d76316f 100644
--- a/iphone/Maps/Bookmarks/BookmarksSection.mm
+++ b/iphone/Maps/Bookmarks/BookmarksSection.mm
@@ -51,6 +51,10 @@ CGFloat const kPinDiameter = 22.0f;
   return self.isEditable;
 }
 
+- (BOOL)canSelect {
+  return YES;
+}
+
 - (void)fillCell:(UITableViewCell *)cell
   withBookmarkDetails:(Bookmark const *)bookmark
           andLocation:(CLLocation *)location {
@@ -104,13 +108,12 @@ CGFloat const kPinDiameter = 22.0f;
   [self fillCell:cell withBookmarkDetails:bookmark andLocation:location];
 }
 
-- (BOOL)didSelectRow:(NSInteger)row {
+- (void)didSelectRow:(NSInteger)row {
   auto const bmId = [self markIdForRow:row];
   [Statistics logEvent:kStatEventName(kStatBookmarks, kStatShowOnMap)];
   // Same as "Close".
   [MWMSearchManager manager].state = MWMSearchManagerStateHidden;
   GetFramework().ShowBookmark(bmId);
-  return YES;
 }
 
 - (void)deleteRow:(NSInteger)row {
diff --git a/iphone/Maps/Bookmarks/BookmarksVC.mm b/iphone/Maps/Bookmarks/BookmarksVC.mm
index c8d97efb32..fa3d8a7965 100644
--- a/iphone/Maps/Bookmarks/BookmarksVC.mm
+++ b/iphone/Maps/Bookmarks/BookmarksVC.mm
@@ -667,16 +667,18 @@ using namespace std;
   return cell;
 }
 
+- (nullable NSIndexPath *)tableView:(UITableView *)tableView willSelectRowAtIndexPath:(NSIndexPath *)indexPath {
+  if ([[self currentSections][indexPath.section] canSelect])
+    return indexPath;
+  return nil;
+}
+
 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
   // Remove cell selection
   [self.tableView deselectRowAtIndexPath:indexPath animated:YES];
-
-  auto const close = [[self currentSections][indexPath.section] didSelectRow:indexPath.row];
-
+  [[self currentSections][indexPath.section] didSelectRow:indexPath.row];
   [self.searchBar resignFirstResponder];
-
-  if (close)
-    [self.navigationController popToRootViewControllerAnimated:NO];
+  [self.navigationController popToRootViewControllerAnimated:NO];
 }
 
 - (BOOL)tableView:(UITableView *)tableView canEditRowAtIndexPath:(NSIndexPath *)indexPath {
diff --git a/iphone/Maps/Bookmarks/InfoSection.mm b/iphone/Maps/Bookmarks/InfoSection.mm
index 756fb0ce7b..640b005e09 100644
--- a/iphone/Maps/Bookmarks/InfoSection.mm
+++ b/iphone/Maps/Bookmarks/InfoSection.mm
@@ -39,6 +39,10 @@
   return NO;
 }
 
+- (BOOL)canSelect {
+  return NO;
+}
+
 - (UITableViewCell *)tableView:(UITableView *)tableView cellForRow:(NSInteger)row {
   if (self.infoCell != nil)
     return self.infoCell;
@@ -58,8 +62,7 @@
   return cell;
 }
 
-- (BOOL)didSelectRow:(NSInteger)row {
-  return NO;
+- (void)didSelectRow:(NSInteger)row {
 }
 
 - (void)deleteRow:(NSInteger)row {
diff --git a/iphone/Maps/Bookmarks/MWMCategoryInfoCell.mm b/iphone/Maps/Bookmarks/MWMCategoryInfoCell.mm
index 33d97c13f6..c58cd5b0a5 100644
--- a/iphone/Maps/Bookmarks/MWMCategoryInfoCell.mm
+++ b/iphone/Maps/Bookmarks/MWMCategoryInfoCell.mm
@@ -6,8 +6,6 @@
 #include "kml/types.hpp"
 #include "kml/type_utils.hpp"
 
-NS_ASSUME_NONNULL_BEGIN
-
 @interface MWMCategoryInfoCell()
 
 @property (weak, nonatomic) IBOutlet UILabel * titleLabel;
@@ -17,8 +15,8 @@ NS_ASSUME_NONNULL_BEGIN
 @property (weak, nonatomic) IBOutlet NSLayoutConstraint * infoToBottomConstraint;
 @property (weak, nonatomic) IBOutlet NSLayoutConstraint * infoHeightConstraint;
 
-@property(copy, nonatomic, nullable) NSAttributedString *info;
-@property(copy, nonatomic, nullable) NSString *shortInfo;
+@property(copy, nonatomic) NSAttributedString *info;
+@property(copy, nonatomic) NSString *shortInfo;
 @property (weak, nonatomic) id<MWMCategoryInfoCellDelegate> delegate;
 
 @end
@@ -99,5 +97,3 @@ NS_ASSUME_NONNULL_BEGIN
 }
 
 @end
-
-NS_ASSUME_NONNULL_END
diff --git a/iphone/Maps/Bookmarks/TableSectionDataSource.h b/iphone/Maps/Bookmarks/TableSectionDataSource.h
index f04e37b354..e555fe8ce2 100644
--- a/iphone/Maps/Bookmarks/TableSectionDataSource.h
+++ b/iphone/Maps/Bookmarks/TableSectionDataSource.h
@@ -7,10 +7,11 @@ NS_ASSUME_NONNULL_BEGIN
 - (NSInteger)numberOfRows;
 - (nullable NSString *)title;
 - (BOOL)canEdit;
+- (BOOL)canSelect;
 
 - (UITableViewCell *)tableView:(UITableView *)tableView cellForRow:(NSInteger)row;
 
-- (BOOL)didSelectRow:(NSInteger)row;
+- (void)didSelectRow:(NSInteger)row;
 - (void)deleteRow:(NSInteger)row;
 
 @optional
diff --git a/iphone/Maps/Bookmarks/TracksSection.mm b/iphone/Maps/Bookmarks/TracksSection.mm
index 1128f43ff7..d5a3f19a55 100644
--- a/iphone/Maps/Bookmarks/TracksSection.mm
+++ b/iphone/Maps/Bookmarks/TracksSection.mm
@@ -45,6 +45,10 @@ CGFloat const kPinDiameter = 22.0f;
   return self.isEditable;
 }
 
+- (BOOL)canSelect {
+  return YES;
+}
+
 - (UITableViewCell *)tableView:(UITableView *)tableView cellForRow:(NSInteger)row {
   UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:@"TrackCell"];
   if (!cell)
@@ -70,10 +74,9 @@ CGFloat const kPinDiameter = 22.0f;
   return cell;
 }
 
-- (BOOL)didSelectRow:(NSInteger)row {
+- (void)didSelectRow:(NSInteger)row {
   auto const trackId = [self trackIdForRow:row];
   GetFramework().ShowTrack(trackId);
-  return YES;
 }
 
 - (void)deleteRow:(NSInteger)row {