diff --git a/android/src/com/mapswithme/maps/MwmActivity.java b/android/src/com/mapswithme/maps/MwmActivity.java
index 1ce6ff50f6..a38714e563 100644
--- a/android/src/com/mapswithme/maps/MwmActivity.java
+++ b/android/src/com/mapswithme/maps/MwmActivity.java
@@ -1053,6 +1053,13 @@ public class MwmActivity extends BaseMwmFragmentActivity
       hideBookmarkCategoryToolbar();
       return;
     }
+
+    if (RoutingController.get().isNavigating())
+    {
+      RoutingController.get().resetToPlanningState();
+      return;
+    }
+
     boolean isRoutingCancelled = RoutingController.get().cancel();
     if (!closePlacePage() && !closeSidePanel() && !isRoutingCancelled
         && !closePositionChooser())
@@ -1676,6 +1683,12 @@ public class MwmActivity extends BaseMwmFragmentActivity
     closePlacePage();
   }
 
+  @Override
+  public void onResetToPlanningState()
+  {
+    closePlacePage();
+  }
+
   @Override
   public void onBuiltRoute()
   {
diff --git a/android/src/com/mapswithme/maps/routing/RoutingController.java b/android/src/com/mapswithme/maps/routing/RoutingController.java
index 21676383fc..5ddc94c3f2 100644
--- a/android/src/com/mapswithme/maps/routing/RoutingController.java
+++ b/android/src/com/mapswithme/maps/routing/RoutingController.java
@@ -67,6 +67,7 @@ public class RoutingController implements Initializable<Void>
     void onNavigationStarted();
     void onAddedStop();
     void onRemovedStop();
+    void onResetToPlanningState();
     void onBuiltRoute();
     void onDrivingOptionsWarning();
     boolean isSubwayEnabled();
@@ -521,6 +522,14 @@ public class RoutingController implements Initializable<Void>
     backToPlaningStateIfNavigating();
   }
 
+  public void resetToPlanningState()
+  {
+    build();
+    if (mContainer != null)
+      mContainer.onResetToPlanningState();
+    backToPlaningStateIfNavigating();
+  }
+
   private void backToPlaningStateIfNavigating()
   {
     if (!isNavigating())