diff --git a/iphone/Maps/Classes/MapViewController.mm b/iphone/Maps/Classes/MapViewController.mm
index 28c097bd9e..bc758d463a 100644
--- a/iphone/Maps/Classes/MapViewController.mm
+++ b/iphone/Maps/Classes/MapViewController.mm
@@ -682,6 +682,7 @@ NSInteger compareAddress(id l, id r, void * context)
     self.navigationItem.leftBarButtonItem = [[[UIBarButtonItem alloc] initWithTitle:NSLocalizedString(@"back", nil) style: UIBarButtonItemStyleDone target:self action:@selector(returnToApiApp)] autorelease];
     self.navigationItem.title = [NSString stringWithUTF8String:GetFramework().GetMapApiAppTitle().c_str()];
     self.navigationController.navigationBarHidden = NO;
+    [self dismissPopover];
   }
 }
 
diff --git a/iphone/Maps/Classes/MapsAppDelegate.mm b/iphone/Maps/Classes/MapsAppDelegate.mm
index 0a66f95245..c8c7630a7d 100644
--- a/iphone/Maps/Classes/MapsAppDelegate.mm
+++ b/iphone/Maps/Classes/MapsAppDelegate.mm
@@ -206,9 +206,11 @@ void InitLocalizedStrings()
     if (f.SetViewportByURL([url.absoluteString UTF8String], apiPoint));
     {
       [[Statistics instance] logApiUsage:sourceApplication];
-      [self showMap];
+      GetFramework().GetBalloonManager().Hide();
       if (f.GetMapApiPoints().size() == 1)
         [self showParsedBookmarkOnMap:apiPoint];
+      else
+        [self showMap];
       [m_mapViewController prepareForApi];
       return YES;
     }