diff --git a/android/src/com/mapswithme/maps/MwmActivity.java b/android/src/com/mapswithme/maps/MwmActivity.java
index 7839eb0d03..8a6defd0c1 100644
--- a/android/src/com/mapswithme/maps/MwmActivity.java
+++ b/android/src/com/mapswithme/maps/MwmActivity.java
@@ -498,7 +498,8 @@ public class MwmActivity extends BaseMwmFragmentActivity
       @Override
       public void onCloseRouting()
       {
-        closeRouting();
+        mMainMenu.setNavigationMode(false);
+        adjustZoomButtons(false);
       }
 
       @Override
@@ -1101,7 +1102,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
     if (mSearchController.hide())
       return;
 
-    if (!closePlacePage() && !closeSidePanel())
+    if (!closePlacePage() && !closeSidePanel() && !closeRouting())
       super.onBackPressed();
   }
 
@@ -1314,11 +1315,15 @@ public class MwmActivity extends BaseMwmFragmentActivity
     }
   }
 
-  private void closeRouting()
+  private boolean closeRouting()
   {
+    if (mLayoutRouting.getState() == RoutingLayout.State.HIDDEN)
+      return false;
+
     mLayoutRouting.setState(RoutingLayout.State.HIDDEN, true);
     mMainMenu.setNavigationMode(false);
     adjustZoomButtons(false);
+    return true;
   }
 
   @Override
diff --git a/android/src/com/mapswithme/maps/widget/RoutingLayout.java b/android/src/com/mapswithme/maps/widget/RoutingLayout.java
index 7e83d4a1d6..4324628ab5 100644
--- a/android/src/com/mapswithme/maps/widget/RoutingLayout.java
+++ b/android/src/com/mapswithme/maps/widget/RoutingLayout.java
@@ -180,6 +180,7 @@ public class RoutingLayout extends FrameLayout implements View.OnClickListener
       AlohaHelper.logClick(AlohaHelper.ROUTING_VEHICLE_SET);
       Framework.setRouter(Framework.ROUTER_TYPE_VEHICLE);
       mListener.onRouteTypeChange(Framework.ROUTER_TYPE_VEHICLE);
+      setState(State.PREPARING, true);
       break;
     }
   }