diff --git a/iphone/Maps/Bookmarks/BalloonView.h b/iphone/Maps/Bookmarks/BalloonView.h
index 0aa8cf1875..8721f84805 100644
--- a/iphone/Maps/Bookmarks/BalloonView.h
+++ b/iphone/Maps/Bookmarks/BalloonView.h
@@ -30,6 +30,7 @@
 - (void) showInView:(UIView *)view atPoint:(CGPoint)pt;
 - (void) updatePosition:(UIView *)view atPoint:(CGPoint)pt;
 - (void) hide;
+- (void) clear;
 
 // Kosher method to add bookmark into the Framework.
 // It automatically "edits" bookmark if it's already exists
diff --git a/iphone/Maps/Bookmarks/BalloonView.mm b/iphone/Maps/Bookmarks/BalloonView.mm
index 75417bb984..3e076f2df1 100644
--- a/iphone/Maps/Bookmarks/BalloonView.mm
+++ b/iphone/Maps/Bookmarks/BalloonView.mm
@@ -4,9 +4,6 @@
 #include "../../../platform/settings.hpp"
 
 
-#define SETTINGS_LAST_BOOKMARK_SET "LastBookmarkSet"
-
-
 @implementation BalloonView
 
 @synthesize globalPosition;
@@ -23,11 +20,9 @@
 
 + (NSString *) getDefaultSetName
 {
-  string savedSet;
-  if (Settings::Get(SETTINGS_LAST_BOOKMARK_SET, savedSet))
-    return [NSString stringWithUTF8String:savedSet.c_str()];
-  // Use default set name
-  return NSLocalizedString(@"my_places", @"Default bookmarks set name");
+  Framework &f = GetFramework();
+  int categoryPos = f.LastEditedCategory();
+  return[NSString stringWithUTF8String:f.GetBmCategory(categoryPos)->GetName().c_str()];
 }
 
 - (id) initWithTarget:(id)target andSelector:(SEL)selector;
@@ -140,8 +135,7 @@
 
 - (void) showInView:(UIView *)view atPoint:(CGPoint)pt
 {
-  if (isDisplayed)
-    [self hide];
+  [self hide];
 
   isDisplayed = YES;
 
@@ -183,10 +177,15 @@
   {
     isDisplayed = NO;
     [m_titleView removeFromSuperview];
-    self.notes = nil;
   }
 }
 
+-(void)clear
+{
+  self.notes = nil;
+  self.editedBookmark = MakeEmptyBookmarkAndCategory();
+}
+
 // Overrided property setter to reload another pin image
 - (void) setColor:(NSString *)newColor
 {
@@ -196,15 +195,6 @@
   self.pinImage.image = [UIImage imageNamed:newColor];
 }
 
-// Overrided property setter to save default set name into the settings
-- (void) setSetName:(NSString *)newName
-{
-  id old = setName;
-  setName = [newName retain];
-  [old release];
-  Settings::Set(SETTINGS_LAST_BOOKMARK_SET, string([newName UTF8String]));
-}
-
 - (void) setTitle:(NSString *)newTitle
 {
   id old = title;
@@ -216,21 +206,27 @@
 
 - (void) addOrEditBookmark
 {
-  Framework & f = GetFramework();
-  Bookmark bm(m2::PointD(globalPosition.x, globalPosition.y),
-              [title UTF8String], [color UTF8String]);
-  if (notes)
-    bm.SetDescription([notes UTF8String]);
-  f.GetBmCategory(editedBookmark.first)->ReplaceBookmark(editedBookmark.second, bm);
+  if (IsValid(self.editedBookmark))
+  {
+    BookmarkCategory * bmCat = GetFramework().GetBmCategory(editedBookmark.first);
+    if (bmCat)
+    {
+      Bookmark * bm = bmCat->GetBookmark(editedBookmark.second);
+      bm->SetName([title UTF8String]);
+      bm->SetType([color UTF8String]);
+      if (notes)
+        bm->SetDescription([notes UTF8String]);
+      else
+        bm->SetDescription([@"" UTF8String]);
 
-  BookmarkCategory * cat = f.GetBmCategory(editedBookmark.first);
+      // Enable category visibility if it was turned off, so user can see newly added or edited bookmark
+      if (!bmCat->IsVisible())
+        bmCat->SetVisible(true);
 
-  // Enable category visibility if it was turned off, so user can see newly added or edited bookmark
-  if (!cat->IsVisible())
-    cat->SetVisible(true);
-
-  // Save all changes
-  cat->SaveToKMLFile();
+      // Save all changes
+      bmCat->SaveToKMLFile();
+    }
+  }
 }
 
 - (void) deleteBookmark
diff --git a/iphone/Maps/Bookmarks/PlacePageVC.mm b/iphone/Maps/Bookmarks/PlacePageVC.mm
index 9b698d1733..78e01a70b2 100644
--- a/iphone/Maps/Bookmarks/PlacePageVC.mm
+++ b/iphone/Maps/Bookmarks/PlacePageVC.mm
@@ -65,7 +65,7 @@
     if (UI_USER_INTERFACE_IDIOM() != UIUserInterfaceIdiomPad && [self.navigationController.viewControllers indexOfObject:self] == NSNotFound)
     {
       [m_balloon addOrEditBookmark];
-      m_balloon.editedBookmark = MakeEmptyBookmarkAndCategory();
+      [m_balloon clear];
     }
   }
   [super viewWillDisappear:animated];
@@ -208,7 +208,7 @@
 - (void)onRemoveClicked
 {
   [m_balloon deleteBookmark];
-  m_balloon.editedBookmark = MakeEmptyBookmarkAndCategory();
+  [m_balloon clear];
 }
 
 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
diff --git a/iphone/Maps/Classes/MapViewController.mm b/iphone/Maps/Classes/MapViewController.mm
index 442097bf6c..c0dbebb74c 100644
--- a/iphone/Maps/Classes/MapViewController.mm
+++ b/iphone/Maps/Classes/MapViewController.mm
@@ -142,6 +142,7 @@ const long long LITE_IDL = 431183278L;
       return;
     }
   }
+  [m_balloonView clear];
   m_balloonView.isCurrentPosition = YES;
   [m_balloonView setTitle:NSLocalizedString(@"my_position", nil)];
   m_balloonView.globalPosition = CGPointMake(point.x, point.y);
@@ -297,7 +298,7 @@ const long long LITE_IDL = 431183278L;
 - (void)popoverControllerDidDismissPopover:(UIPopoverController *)popoverController
 {
   [m_balloonView addOrEditBookmark];
-  m_balloonView.editedBookmark = MakeEmptyBookmarkAndCategory();
+  [m_balloonView clear];
   [self destroyPopover];
   [self Invalidate];
 }
@@ -334,7 +335,7 @@ const long long LITE_IDL = 431183278L;
   if (m_balloonView.isDisplayed)
   {
     [m_balloonView hide];
-    m_balloonView.editedBookmark = MakeEmptyBookmarkAndCategory();
+    [m_balloonView clear];
     wasBalloonDisplayed = YES;
 //    if (!isLongClick)
 //      return;
@@ -392,6 +393,7 @@ const long long LITE_IDL = 431183278L;
 
 - (void)showSearchResultAsBookmarkAtMercatorPoint:(m2::PointD const &)pt withInfo:(Framework::AddressInfo const &)info
 {
+  [m_balloonView clear];
   m_balloonView.globalPosition = CGPointMake(pt.x, pt.y);
   m_balloonView.isCurrentPosition = NO;
   [self updatePinTexts:info];
@@ -850,11 +852,10 @@ NSInteger compareAddress(id l, id r, void * context)
 
 - (void)showBalloonWithText:(NSString *)text andGlobalPoint:(m2::PointD) point
 {
+  [m_balloonView clear];
   m_balloonView.globalPosition = CGPointMake(point.x, point.y);
   m_balloonView.title = text;
   m_balloonView.isCurrentPosition = NO;
-  m_balloonView.editedBookmark = pair<int, int>(-1, -1);
-  m_balloonView.notes = @"";
   CGFloat const scaleFactor = self.view.contentScaleFactor;
 
   point = GetFramework().GtoP(point);
@@ -876,7 +877,7 @@ NSInteger compareAddress(id l, id r, void * context)
       [m_balloonView addOrEditBookmark];
     else
       [m_balloonView deleteBookmark];
-    m_balloonView.editedBookmark = MakeEmptyBookmarkAndCategory();
+    [m_balloonView clear];
   }
   [popover dismissPopoverAnimated:YES];
   [self destroyPopover];