diff --git a/OsmAnd/src/net/osmand/plus/track/TrackMenuFragment.java b/OsmAnd/src/net/osmand/plus/track/TrackMenuFragment.java
index cfc6610b5b..7f3fef69ed 100644
--- a/OsmAnd/src/net/osmand/plus/track/TrackMenuFragment.java
+++ b/OsmAnd/src/net/osmand/plus/track/TrackMenuFragment.java
@@ -270,12 +270,7 @@ public class TrackMenuFragment extends ContextMenuScrollFragment implements Card
 			setupToolbar();
 			updateHeader();
 			setupButtons(view);
-			runLayoutListener(new Runnable() {
-				@Override
-				public void run() {
-					updateMenuState();
-				}
-			});
+			calculateLayoutAndUpdateMenuState();
 		}
 		return view;
 	}
@@ -842,12 +837,7 @@ public class TrackMenuFragment extends ContextMenuScrollFragment implements Card
 						menuType = type;
 						setupCards();
 						updateHeader();
-						runLayoutListener(new Runnable() {
-							@Override
-							public void run() {
-								updateMenuState();
-							}
-						});
+						calculateLayoutAndUpdateMenuState();
 						break;
 					}
 				}
@@ -856,6 +846,15 @@ public class TrackMenuFragment extends ContextMenuScrollFragment implements Card
 		});
 	}
 
+	private void calculateLayoutAndUpdateMenuState() {
+		runLayoutListener(new Runnable() {
+			@Override
+			public void run() {
+				updateMenuState();
+			}
+		});
+	}
+
 	private void updateMenuState() {
 		if (menuType == TrackMenuType.OPTIONS) {
 			openMenuFullScreen();