diff --git a/src/MapWidget.vala b/src/MapWidget.vala
index 6f69f2b..d4b3624 100644
--- a/src/MapWidget.vala
+++ b/src/MapWidget.vala
@@ -170,10 +170,23 @@ public class Maps.MapWidget : Gtk.Box {
         var marker = new Shumate.Point () {
             latitude = latitude,
             longitude = longitude,
-            selectable = true,
-            tooltip_text = _("You are here")
+            selectable = true
+        };
+
+        var label = new Granite.HeaderLabel (_("You are here"));
+
+        var popover = new Gtk.Popover () {
+            child = label
         };
 
+        var menubutton = new Gtk.MenuButton () {
+            popover = popover,
+            opacity = 0.0
+        };
+
+        popover.position = Gtk.PositionType.TOP;
+        marker.child = menubutton;
+
         location_layer.add_marker (marker);
     }