diff --git a/android/src/com/mapswithme/maps/MwmActivity.java b/android/src/com/mapswithme/maps/MwmActivity.java
index b695b7f25a..9a81887960 100644
--- a/android/src/com/mapswithme/maps/MwmActivity.java
+++ b/android/src/com/mapswithme/maps/MwmActivity.java
@@ -653,6 +653,19 @@ public class MwmActivity extends BaseMwmFragmentActivity
     return false;
   }
 
+  private void closeAllFloatingPanels()
+  {
+    if (!mIsFragmentContainer)
+      return;
+
+    closePlacePage();
+    if (removeCurrentFragment(true))
+    {
+      InputUtils.hideKeyboard(mFadeView);
+      mFadeView.fadeOut();
+    }
+  }
+
   public void closeMenu(String statEvent, String alohaStatEvent, @Nullable Runnable procAfterClose)
   {
     Statistics.INSTANCE.trackEvent(statEvent);
@@ -1562,14 +1575,11 @@ public class MwmActivity extends BaseMwmFragmentActivity
     else
     {
       if (mIsFragmentContainer)
-      {
-        closeSidePanel();
         adjustTraffic(0, UiUtils.getStatusBarHeight(getApplicationContext()));
-      }
       else
-      {
         mRoutingPlanInplaceController.show(false);
-      }
+
+      closeAllFloatingPanels();
 
       if (completionListener != null)
         completionListener.run();