diff --git a/src/plugins/lib/maps/geography.py b/src/plugins/lib/maps/geography.py
index 02769f1ca..7a6f31406 100644
--- a/src/plugins/lib/maps/geography.py
+++ b/src/plugins/lib/maps/geography.py
@@ -155,7 +155,6 @@ class PlaceSelection(ManagedWindow.ManagedWindow, osmGpsMap):
         self.oldvalue = oldvalue
         self.place_list = places
         self.function = function
-        self.selection_layer = None
         self.selection_layer = layer
         self.layer = layer
         alignment = gtk.Alignment(0,1,0,0)
@@ -366,6 +365,7 @@ class GeoGraphyView(osmGpsMap, NavigationView):
         """Called when the page changes."""
         NavigationView.change_page(self)
         self.uistate.clear_filter_results()
+        self.end_selection = None
 
     def on_delete(self):
         """
@@ -827,6 +827,7 @@ class GeoGraphyView(osmGpsMap, NavigationView):
                                          config.get("geography.zoom") )
         else:
             self._autozoom()
+            self.end_selection = None
             self.save_center(self.latit, self.longt)
             config.set("geography.zoom",self.osm.props.zoom)
 
diff --git a/src/plugins/lib/maps/grampsmaps.py b/src/plugins/lib/maps/grampsmaps.py
index 7dcbf510f..d1d6535da 100644
--- a/src/plugins/lib/maps/grampsmaps.py
+++ b/src/plugins/lib/maps/grampsmaps.py
@@ -192,6 +192,7 @@ class osmGpsMap():
             self.osm = osmgpsmap.GpsMap(tile_cache=tiles_path,
                                         map_source=constants.map_type[map_type])
         current_map = osmgpsmap.GpsMapOsd( show_dpad=False, show_zoom=True)
+        self.end_selection = None
         self.osm.layer_add(current_map)
         self.osm.layer_add(DummyLayer())
         self.selection_layer = self.add_selection_layer()