diff --git a/OsmAnd/res/layout/map_context_menu_fragment.xml b/OsmAnd/res/layout/map_context_menu_fragment.xml
index 6ebfddcc10..bfb51ff362 100644
--- a/OsmAnd/res/layout/map_context_menu_fragment.xml
+++ b/OsmAnd/res/layout/map_context_menu_fragment.xml
@@ -122,7 +122,7 @@
             </LinearLayout>
 
             <LinearLayout
-                android:id="@+id/additional_info_row"
+                android:id="@+id/additional_info_row_container"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content">
 
@@ -137,7 +137,12 @@
                 android:paddingBottom="3dp"
                 android:paddingLeft="@dimen/context_menu_padding_margin_default"
                 android:paddingRight="@dimen/context_menu_padding_margin_default">
-
+                
+                <LinearLayout
+                    android:id="@+id/additional_info_row"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content">
+                    
                 <net.osmand.plus.widgets.TextViewEx
                     android:id="@+id/context_menu_line3"
                     style="@style/TextAppearance.ContextMenuSubtitle"
@@ -194,6 +199,7 @@
                         tools:textColor="?android:textColorSecondary"/>
 
                 </LinearLayout>
+                </LinearLayout>
 
             </LinearLayout>
 
diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenuFragment.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenuFragment.java
index 06b4717b21..4d6132baf1 100644
--- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenuFragment.java
+++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenuFragment.java
@@ -1287,7 +1287,7 @@ public class MapContextMenuFragment extends BaseOsmAndFragment implements Downlo
 							}
 
 							int line3Height = 0;
-							View line3Container = view.findViewById(R.id.additional_info_row);
+							View line3Container = view.findViewById(R.id.additional_info_row_container);
 							if (line3Container.getVisibility() == View.VISIBLE) {
 								line3Height = line3Container.getMeasuredHeight();
 							}
@@ -1520,10 +1520,13 @@ public class MapContextMenuFragment extends BaseOsmAndFragment implements Downlo
 				&& compassView.getVisibility() == View.INVISIBLE
 				&& titleButtonContainer.getVisibility() == View.GONE
 				&& downloadButtonsContainer.getVisibility() == View.GONE
-				&& titleBottomButtonContainer.getVisibility() == View.GONE
-				&& titleProgressContainer.getVisibility() == View.VISIBLE) {
+				&& titleBottomButtonContainer.getVisibility() == View.GONE) {
+			if (titleProgressContainer.getVisibility() == View.VISIBLE) {
+				view.findViewById(R.id.additional_info_row_container).setVisibility(View.GONE);
+			}
 			view.findViewById(R.id.additional_info_row).setVisibility(View.GONE);
 		} else {
+			view.findViewById(R.id.additional_info_row_container).setVisibility(View.VISIBLE);
 			view.findViewById(R.id.additional_info_row).setVisibility(View.VISIBLE);
 		}
 	}
@@ -1909,6 +1912,7 @@ public class MapContextMenuFragment extends BaseOsmAndFragment implements Downlo
 	private void doAfterMenuStateChange(int previousState, int newState) {
 		updateCompassVisibility();
 		updateAdditionalInfoVisibility();
+		runLayoutListener();
 	}
 }