diff --git a/app/src/main/java/de/apps4ics/mountainnavigation/MainActivity.java b/app/src/main/java/de/apps4ics/mountainnavigation/MainActivity.java
index 32d399d..4331466 100644
--- a/app/src/main/java/de/apps4ics/mountainnavigation/MainActivity.java
+++ b/app/src/main/java/de/apps4ics/mountainnavigation/MainActivity.java
@@ -212,7 +212,7 @@
         foundLocations = new ArrayList<>();
 
         currentPosition = new Marker(mapView);
-        currentPosition.setInfoWindow(new ModernInfoWindow(mapView));
+        currentPosition.setInfoWindow(new ModernInfoWindow(mapView, false));
         currentPosition.setAnchor(Marker.ANCHOR_CENTER, Marker.ANCHOR_CENTER);
         currentPosition.setTitle(getString(R.string.osm_marker_title));
         currentPosition.setIcon(res.getDrawable(R.drawable.ic_currency_96, null));
diff --git a/app/src/main/java/de/apps4ics/mountainnavigation/ModernInfoWindow.java b/app/src/main/java/de/apps4ics/mountainnavigation/ModernInfoWindow.java
index a8f73d9..956666d 100644
--- a/app/src/main/java/de/apps4ics/mountainnavigation/ModernInfoWindow.java
+++ b/app/src/main/java/de/apps4ics/mountainnavigation/ModernInfoWindow.java
@@ -28,14 +28,18 @@
 import org.osmdroid.views.MapView;
 
 public class ModernInfoWindow extends MarkerInfoWindow {
-    public ModernInfoWindow(final MapView mapView) {
+    public ModernInfoWindow(final MapView mapView, boolean isEditable) {
         super(R.layout.overlay_custom_bubble, mapView);
         Button editBtn = (Button) mView.findViewById(R.id.edit_poi_btn);
-        editBtn.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                MainActivity.Toaster("Edit!", v.getContext());
-            }
-        });
+        if(isEditable) {
+            editBtn.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    MainActivity.Toaster("Edit!", v.getContext());
+                }
+            });
+        } else {
+            editBtn.setVisibility(View.INVISIBLE);
+        }
     }
 }
diff --git a/app/src/main/java/de/apps4ics/mountainnavigation/handlers/PoiHandler.java b/app/src/main/java/de/apps4ics/mountainnavigation/handlers/PoiHandler.java
index 75cd58e..487d77b 100644
--- a/app/src/main/java/de/apps4ics/mountainnavigation/handlers/PoiHandler.java
+++ b/app/src/main/java/de/apps4ics/mountainnavigation/handlers/PoiHandler.java
@@ -75,6 +75,7 @@
 import java.util.concurrent.ExecutionException;
 
 import de.apps4ics.mountainnavigation.MainActivity;
+import de.apps4ics.mountainnavigation.ModernInfoWindow;
 import de.apps4ics.mountainnavigation.R;
 import de.apps4ics.mountainnavigation.overlays.ImageDialogItemizedIconOverlay;
 import de.apps4ics.mountainnavigation.overlays.MapDialogItemizedIconOverlay;
@@ -774,6 +775,7 @@
                     snippetText += "\n";
                     snippetText += "Climbing: " + ((p.getClimbing() == 1) ? "Yes!" : "No!");
                     Marker positionMarker = new Marker(mapView);
+                    positionMarker.setInfoWindow(new ModernInfoWindow(mapView, true));
                     positionMarker.setPosition(new GeoPoint(pathEnd.getLat(), pathEnd.getLon(), pathEnd.getAlt()));
                     positionMarker.setAnchor(Marker.ANCHOR_CENTER, Marker.ANCHOR_BOTTOM);
                     positionMarker.setTitle(titleText);
@@ -787,6 +789,7 @@
             }
 
             Marker positionMarker = new Marker(mapView);
+            positionMarker.setInfoWindow(new ModernInfoWindow(mapView, true));
             positionMarker.setPosition(gp);
             positionMarker.setAnchor(Marker.ANCHOR_CENTER, Marker.ANCHOR_BOTTOM);
             positionMarker.setTitle(titleText);