diff --git a/iphone/Maps/Classes/MapViewController.mm b/iphone/Maps/Classes/MapViewController.mm
index aff60e4b74..a70476b437 100644
--- a/iphone/Maps/Classes/MapViewController.mm
+++ b/iphone/Maps/Classes/MapViewController.mm
@@ -106,7 +106,9 @@ Framework * m_framework = NULL;
 
 - (void)onShowDownloaderTimer:(NSTimer *)timer
 {
-  [self OnSettingsClicked:nil];
+  // Only display downloader if no more modal controllers are already displayed
+  if (self.modalViewController == nil)
+    [self OnSettingsClicked:nil];
   [timer invalidate];
 }