diff --git a/android/src/com/mapswithme/maps/MwmActivity.java b/android/src/com/mapswithme/maps/MwmActivity.java
index bef50c50c9..c660618c52 100644
--- a/android/src/com/mapswithme/maps/MwmActivity.java
+++ b/android/src/com/mapswithme/maps/MwmActivity.java
@@ -1746,7 +1746,10 @@ public class MwmActivity extends BaseMwmFragmentActivity
       {
         replaceFragment(RoutingPlanFragment.class, null, completionListener);
         showAddStartOrFinishFrame(RoutingController.get(), false);
-        adjustTraffic(UiUtils.dimen(R.dimen.panel_width), UiUtils.getStatusBarHeight(getApplicationContext()));
+        int width = UiUtils.dimen(R.dimen.panel_width);
+        adjustTraffic(width, UiUtils.getStatusBarHeight(getApplicationContext()));
+        if (mNavigationController != null)
+          mNavigationController.adjustSearchButtons(width);
       }
       else
       {
@@ -1765,9 +1768,15 @@ public class MwmActivity extends BaseMwmFragmentActivity
     else
     {
       if (mIsFragmentContainer)
+      {
         adjustTraffic(0, UiUtils.getStatusBarHeight(getApplicationContext()));
+        if (mNavigationController != null)
+          mNavigationController.adjustSearchButtons(0);
+      }
       else
+      {
         mRoutingPlanInplaceController.show(false);
+      }
 
       closeAllFloatingPanels();
 
diff --git a/android/src/com/mapswithme/maps/routing/NavigationController.java b/android/src/com/mapswithme/maps/routing/NavigationController.java
index 6f9fd5b4fe..4bce0a3b33 100644
--- a/android/src/com/mapswithme/maps/routing/NavigationController.java
+++ b/android/src/com/mapswithme/maps/routing/NavigationController.java
@@ -11,6 +11,7 @@ import android.support.annotation.Nullable;
 import android.text.TextUtils;
 import android.util.Pair;
 import android.view.View;
+import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
 
@@ -310,6 +311,13 @@ public class NavigationController implements TrafficManager.TrafficCallback, Vie
     UiUtils.showIf(show, mSearchButtonFrame);
   }
 
+  public void adjustSearchButtons(int width)
+  {
+    ViewGroup.MarginLayoutParams params = (ViewGroup.MarginLayoutParams) mSearchButtonFrame.getLayoutParams();
+    params.setMargins(width, params.topMargin, params.rightMargin, params.bottomMargin);
+    mSearchButtonFrame.requestLayout();
+  }
+
   public void show(boolean show)
   {
     UiUtils.showIf(show, mFrame);