diff --git a/src/plugins/lib/maps/geography.py b/src/plugins/lib/maps/geography.py
index 5177d4764..dc8d2bc47 100644
--- a/src/plugins/lib/maps/geography.py
+++ b/src/plugins/lib/maps/geography.py
@@ -953,7 +953,11 @@ class GeoGraphyView(osmGpsMap, NavigationView):
         """
         Link an existing place using longitude and latitude of location centered
         on the map
+        If we have a place history, we must show all places to avoid an empty
+        place selection in the PlaceSelection.
         """
+        if self.uistate.get_active('Place'):
+            self._createmap(None)
         selector = SelectPlace(self.dbstate, self.uistate, [])
         place = selector.run()
         if place: