diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/fragments/MarkerDetailFragment.java b/myTracks/src/main/java/com/google/android/apps/mytracks/fragments/MarkerDetailFragment.java
index 919b7f923..b2178e9f3 100644
--- a/myTracks/src/main/java/com/google/android/apps/mytracks/fragments/MarkerDetailFragment.java
+++ b/myTracks/src/main/java/com/google/android/apps/mytracks/fragments/MarkerDetailFragment.java
@@ -39,7 +39,6 @@ import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentActivity;
 
 import com.google.android.apps.mytracks.MarkerEditActivity;
-import com.google.android.apps.mytracks.TrackDetailActivity;
 import com.google.android.apps.mytracks.content.MyTracksProviderUtils;
 import com.google.android.apps.mytracks.content.Track;
 import com.google.android.apps.mytracks.content.Waypoint;
@@ -188,16 +187,13 @@ public class MarkerDetailFragment extends Fragment {
   public boolean onOptionsItemSelected(MenuItem item) {
     long markerId = getArguments().getLong(KEY_MARKER_ID);
     FragmentActivity fragmentActivity = getActivity();
-    Intent intent;
 
     switch (item.getItemId()) {
       case R.id.marker_detail_show_on_map:
-        intent = IntentUtils.newIntent(fragmentActivity, TrackDetailActivity.class)
-            .putExtra(TrackDetailActivity.EXTRA_MARKER_ID, markerId);
-        startActivity(intent);
+        startActivity(IntentUtils.newShowOnMapIntent(waypoint.getLocation().getLatitude(), waypoint.getLocation().getLongitude()));
         return true;
       case R.id.marker_detail_edit:
-        intent = IntentUtils.newIntent(fragmentActivity, MarkerEditActivity.class)
+        Intent intent = IntentUtils.newIntent(fragmentActivity, MarkerEditActivity.class)
             .putExtra(MarkerEditActivity.EXTRA_MARKER_ID, markerId);
         startActivity(intent);
         return true;
diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/util/IntentUtils.java b/myTracks/src/main/java/com/google/android/apps/mytracks/util/IntentUtils.java
index bbd4989c6..7a613ca85 100644
--- a/myTracks/src/main/java/com/google/android/apps/mytracks/util/IntentUtils.java
+++ b/myTracks/src/main/java/com/google/android/apps/mytracks/util/IntentUtils.java
@@ -16,16 +16,16 @@
 
 package com.google.android.apps.mytracks.util;
 
+import android.content.Context;
+import android.content.Intent;
+import android.net.Uri;
+
 import com.google.android.apps.mytracks.content.DescriptionGeneratorImpl;
 import com.google.android.apps.mytracks.content.MyTracksProviderUtils;
 import com.google.android.apps.mytracks.content.Track;
 import com.google.android.apps.mytracks.io.file.TrackFileFormat;
 import com.google.android.maps.mytracks.R;
 
-import android.content.Context;
-import android.content.Intent;
-import android.net.Uri;
-
 import java.io.File;
 
 /**
@@ -73,4 +73,10 @@ public class IntentUtils {
         .putExtra(context.getString(R.string.track_id_broadcast_extra), trackId)
         .setType(trackFileFormat.getMimeType());
   }
+
+  public static Intent newShowOnMapIntent(double latitude, double longitude) {
+    Intent intent = new Intent(Intent.ACTION_VIEW);
+    intent.setData(Uri.parse("geo:" + latitude + "," + longitude));
+    return intent;
+  }
 }