diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog
index 49f2f8501..3404a9edb 100644
--- a/gramps2/ChangeLog
+++ b/gramps2/ChangeLog
@@ -1,3 +1,9 @@
+2006-06-17  Don Allingham  <don@gramps-project.org>
+	* src/Selectors/_BaseSelector.py (BaseSelector.run): handle
+	delete event
+	* src/DataViews/_RelationView.py: remove debug statement
+	* src/DataViews/__init__.py: remove map view for time being
+
 2006-06-16  Don Allingham  <don@gramps-project.org>
 	* src/DataViews/_RelationView.py: clear all subelements on redraw
 	* src/PageView.py: set dirty flag appropriately
diff --git a/gramps2/src/DataViews/_RelationView.py b/gramps2/src/DataViews/_RelationView.py
index 99c0ebca8..dc3ae19c0 100644
--- a/gramps2/src/DataViews/_RelationView.py
+++ b/gramps2/src/DataViews/_RelationView.py
@@ -275,7 +275,6 @@ class RelationshipView(PageView.PersonNavView):
             return (_(u"Unknown"), "")
 
     def redraw(self, *obj):
-        print self.dbstate.active
         if self.dbstate.active:
             self.handle_history(self.dbstate.active.handle)
             self.change_person(self.dbstate.active.handle)
diff --git a/gramps2/src/DataViews/__init__.py b/gramps2/src/DataViews/__init__.py
index b94a518b8..eb7595d64 100644
--- a/gramps2/src/DataViews/__init__.py
+++ b/gramps2/src/DataViews/__init__.py
@@ -27,10 +27,19 @@ from _EventView import EventView
 from _SourceView import SourceView
 from _PlaceView import PlaceView
 from _MediaView import MediaView
-from _MapView import MapView
+#from _MapView import MapView
 from _RepositoryView import RepositoryView
 
 def get_views():
-    return [PersonView, RelationshipView, FamilyListView, PedigreeView,
-            EventView, SourceView, PlaceView, MediaView,
-            MapView, RepositoryView]
+    return [
+        PersonView,
+        RelationshipView,
+        FamilyListView,
+        PedigreeView,
+        EventView,
+        SourceView,
+        PlaceView,
+        MediaView,
+        #MapView,
+        RepositoryView
+        ]
diff --git a/gramps2/src/Selectors/_BaseSelector.py b/gramps2/src/Selectors/_BaseSelector.py
index 47cde1e75..c9ef85b7c 100644
--- a/gramps2/src/Selectors/_BaseSelector.py
+++ b/gramps2/src/Selectors/_BaseSelector.py
@@ -114,9 +114,11 @@ class BaseSelector(ManagedWindow.ManagedWindow):
             else:
                 return_value = None
 	    return return_value
-        else:
+        elif val != gtk.RESPONSE_DELETE_EVENT:
             self.close()
             return None
+        else:
+            return None
 
     def _local_init(self):
         # define selector-specific init routine