diff --git a/android/YoPme/src/com/mapswithme/yopme/BackscreenActivity.java b/android/YoPme/src/com/mapswithme/yopme/BackscreenActivity.java
index 95846e0477..1b5d880991 100644
--- a/android/YoPme/src/com/mapswithme/yopme/BackscreenActivity.java
+++ b/android/YoPme/src/com/mapswithme/yopme/BackscreenActivity.java
@@ -216,28 +216,28 @@ public class BackscreenActivity extends BSActivity implements LocationListener
   {
     super.onHandleIntent(intent);
 
-    notifyBSUpdated();
+    final String action = intent.getAction();
+    if (action != null && (ACTION_LOCATION + ACTION_SHOW_RECT).contains(action))
+    {
+      extractLocation(intent);
+      extractZoom(intent);
+
+      if (ACTION_LOCATION.equals(action))
+        setToLocationMode();
+      else if (ACTION_SHOW_RECT.equals(action))
+        setToPoiMode(intent);
+
+      mLogger.d("onHandleIntent : requestLocationUpdate");
+      requestLocationUpdate();
+
+      notifyBSUpdated();
+    }
 
     new Handler(Looper.getMainLooper()).post(new Runnable()
     {
       @Override
       public void run()
       {
-        final String action = intent.getAction();
-        if (action != null && (ACTION_LOCATION + ACTION_SHOW_RECT).contains(action))
-        {
-          extractLocation(intent);
-          extractZoom(intent);
-
-          if (ACTION_LOCATION.equals(intent.getAction()))
-            setToLocationMode();
-          else if (ACTION_SHOW_RECT.equals(intent.getAction()))
-            setToPoiMode(intent);
-
-          mLogger.d("onHandleIntent : requestLocationUpdate");
-          requestLocationUpdate();
-        }
-
         mLogger.d("onHandleIntent : invalidate");
         updateData();
         invalidate();