diff --git a/iphone/Maps/Classes/MapViewController.mm b/iphone/Maps/Classes/MapViewController.mm
index f11f7d419d..dabe35141d 100644
--- a/iphone/Maps/Classes/MapViewController.mm
+++ b/iphone/Maps/Classes/MapViewController.mm
@@ -67,12 +67,14 @@ storage::Storage m_storage;
     m_framework->StartLocationService(bind(locUpdatedImpl, self, onLocUpdatedSel));
     ((UIBarButtonItem *)sender).style = UIBarButtonItemStyleDone;
     ((UIBarButtonItem *)sender).image = [UIImage imageNamed:@"location-search.png"];
+    [[MapsAppDelegate theApp] disableStandby];
   }
   else
   {
     m_framework->StopLocationService();
     ((UIBarButtonItem *)sender).style = UIBarButtonItemStyleBordered;
     m_myPositionButton.image = [UIImage imageNamed:@"location.png"];
+    [[MapsAppDelegate theApp] enableStandby];
   }
 }
 
diff --git a/iphone/Maps/Classes/MapsAppDelegate.h b/iphone/Maps/Classes/MapsAppDelegate.h
index 16ab42c41c..bed8ea7fb2 100644
--- a/iphone/Maps/Classes/MapsAppDelegate.h
+++ b/iphone/Maps/Classes/MapsAppDelegate.h
@@ -9,6 +9,7 @@
 {
   GuideViewController * m_guideViewController;
   SettingsManager * m_settingsManager;
+  NSInteger m_standbyCounter;
 }
 
 @property (nonatomic, retain) IBOutlet UIWindow * window;
@@ -21,5 +22,7 @@
 - (GuideViewController *)guideViewController;
 - (SettingsManager *)settingsManager;
 - (void)onSloynikEngineInitialized:(void *)pEngine;
+- (void)disableStandby;
+- (void)enableStandby;
 
 @end
diff --git a/iphone/Maps/Classes/MapsAppDelegate.mm b/iphone/Maps/Classes/MapsAppDelegate.mm
index e07d751ee4..390ccff599 100644
--- a/iphone/Maps/Classes/MapsAppDelegate.mm
+++ b/iphone/Maps/Classes/MapsAppDelegate.mm
@@ -86,5 +86,18 @@
   [super dealloc];
 }
 
+- (void) disableStandby
+{
+  ++m_standbyCounter;
+  [UIApplication sharedApplication].idleTimerDisabled = YES;
+}
+
+- (void) enableStandby
+{
+  --m_standbyCounter;
+  if (m_standbyCounter == 0)
+    [UIApplication sharedApplication].idleTimerDisabled = NO;
+}
+
 @end
 
diff --git a/iphone/Maps/Platform/IPhoneDownloadManager.mm b/iphone/Maps/Platform/IPhoneDownloadManager.mm
index a1984112b7..5a3d7906ed 100644
--- a/iphone/Maps/Platform/IPhoneDownloadManager.mm
+++ b/iphone/Maps/Platform/IPhoneDownloadManager.mm
@@ -1,6 +1,7 @@
 #include "../../platform/download_manager.hpp"
 
 #import "IPhoneDownload.h"
+#import "MapsAppDelegate.h"
 
 #import <UIKit/UIApplication.h>
 
@@ -42,7 +43,7 @@ public:
     	// save download in array to cancel it later if necessary
     	[activeDownloads addObject:download];
       // prevent device from going to standby
-      [UIApplication sharedApplication].idleTimerDisabled = YES;
+      [[MapsAppDelegate theApp] disableStandby];
     }
     else
     {
@@ -71,7 +72,7 @@ public:
     }
     // enable standby if no more downloads are left
     if ([activeDownloads count] == 0)
-    	[UIApplication sharedApplication].idleTimerDisabled = NO;
+      [[MapsAppDelegate theApp] enableStandby];
   }
 
   virtual void CancelAllDownloads()