diff --git a/OsmAnd/res/layout/map_context_menu_fragment.xml b/OsmAnd/res/layout/map_context_menu_fragment.xml
index cb2a9335a3..4e73daf26a 100644
--- a/OsmAnd/res/layout/map_context_menu_fragment.xml
+++ b/OsmAnd/res/layout/map_context_menu_fragment.xml
@@ -2,12 +2,12 @@
 <LinearLayout android:id="@+id/context_menu_layout"
               xmlns:android="http://schemas.android.com/apk/res/android"
               android:layout_width="fill_parent"
-              android:layout_height="wrap_content"
-              android:layout_gravity="bottom"
+              android:layout_height="fill_parent"
               android:background="@android:color/transparent"
               android:orientation="vertical">
 
     <LinearLayout
+        android:id="@+id/context_menu_shadow_layout"
         android:layout_width="fill_parent"
         android:layout_height="0dp"
         android:layout_weight="1"
@@ -24,12 +24,12 @@
         android:id="@+id/context_menu_main"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        android:layout_weight="0"
         android:background="?attr/bg_map_context_menu"
         android:orientation="vertical">
 
         <LinearLayout
             android:id="@+id/context_menu_top_view"
+            android:baselineAligned="false"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:orientation="horizontal">
diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenuFragment.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenuFragment.java
index 716e9c9cfc..60858352bc 100644
--- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenuFragment.java
+++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenuFragment.java
@@ -12,7 +12,6 @@ import android.view.ViewGroup;
 import android.view.animation.DecelerateInterpolator;
 import android.widget.ImageButton;
 import android.widget.ImageView;
-import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import net.osmand.PlatformUtil;
@@ -85,6 +84,8 @@ public class MapContextMenuFragment extends Fragment {
 
 		View topView = view.findViewById(R.id.context_menu_top_view);
 		mainView = view.findViewById(R.id.context_menu_main);
+		//LinearLayout.LayoutParams lp = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, dpToPx(400));
+		//mainView.setLayoutParams(lp);
 
 		topView.setOnTouchListener(new View.OnTouchListener() {
 
@@ -100,21 +101,16 @@ public class MapContextMenuFragment extends Fragment {
 
 					case MotionEvent.ACTION_MOVE:
 						float y = event.getY();
-						LinearLayout.LayoutParams lp = (LinearLayout.LayoutParams) mainView.getLayoutParams();
-						float top = lp.topMargin + (y - dy);
-						if (top < 0) {
-							lp.topMargin = (int) top;
-							mainView.setLayoutParams(lp);
-						}
+						mainView.setY(mainView.getY() + (y - dy));
 						break;
 
 					case MotionEvent.ACTION_UP:
 					case MotionEvent.ACTION_CANCEL:
 
 						float posY = view.getHeight() - mainViewHeight;
-						if (mainView.getY() != posY) {
+						if (mainView.getY() != posY)
 							mainView.animate().y(posY).setDuration(200).setInterpolator(new DecelerateInterpolator()).start();
-						}
+
 						break;
 
 				}