diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog
index c9b72bfd5..5e28effd0 100644
--- a/gramps2/ChangeLog
+++ b/gramps2/ChangeLog
@@ -20,6 +20,9 @@
 	* src/po/template.po: Update translation template.
 	* src/po/ru.po: Translation update.
 
+	* src/EditSource.py (button_press): Proper invokation of editors.
+	* src/ImageSelect.py: Remove workarounds for window management.
+
 2005-04-23  Julio Sanchez  <jsanchez@users.sourceforge.net>
 	* src/po/es.po: Nearly complete update, but completely untested
 
diff --git a/gramps2/src/EditSource.py b/gramps2/src/EditSource.py
index 53666682f..ef3fcf4d1 100644
--- a/gramps2/src/EditSource.py
+++ b/gramps2/src/EditSource.py
@@ -277,12 +277,12 @@ class EditSource:
                     event, None, 0, None, None, self.db.readonly)
         elif type == 3:
             import EditPlace
-            family = self.db.get_place_from_handle(handle)
-            EditPlace.EditPlace(self.parent,family,self.db)
+            place = self.db.get_place_from_handle(handle)
+            EditPlace.EditPlace(self.parent,place)
         elif type == 5:
             import ImageSelect
             media = self.db.get_object_from_handle(handle)
-            ImageSelect.GlobalMediaProperties(self.db,media,self.parent)
+            ImageSelect.GlobalMediaProperties(self.db,media,self)
 
     def display_references(self):
         
diff --git a/gramps2/src/ImageSelect.py b/gramps2/src/ImageSelect.py
index b3939c05e..c09702002 100644
--- a/gramps2/src/ImageSelect.py
+++ b/gramps2/src/ImageSelect.py
@@ -743,25 +743,16 @@ class LocalMediaProperties:
         self.redraw_attr_list()
         if parent_window:
             self.window.set_transient_for(parent_window)
-        try:
-            self.add_itself_to_menu()
-        except:
-            pass
+        self.add_itself_to_menu()
         self.window.show()
 
     def on_delete_event(self,obj,b):
         self.close_child_windows()
-        try:
-            self.remove_itself_from_menu()
-        except:
-            pass
+        self.remove_itself_from_menu()
 
     def close(self,obj):
         self.close_child_windows()
-        try:
-            self.remove_itself_from_menu()
-        except:
-            pass
+        self.remove_itself_from_menu()
         self.window.destroy()
 
     def close_child_windows(self):
@@ -891,13 +882,10 @@ class GlobalMediaProperties:
         self.dp = DateHandler.parser
         self.dd = DateHandler.displayer
         if obj:
-            try:
-                if self.parent.parent.child_windows.has_key(obj.get_handle()):
-                    self.parent.parent.child_windows[obj.get_handle()].present(None)
-                    return
-                else:
-                    self.win_key = obj.get_handle()
-            except:
+            if self.parent.parent.child_windows.has_key(obj.get_handle()):
+                self.parent.parent.child_windows[obj.get_handle()].present(None)
+                return
+            else:
                 self.win_key = obj.get_handle()
         else:
             self.win_key = self
@@ -1039,10 +1027,7 @@ class GlobalMediaProperties:
         self.display_refs()
         if parent_window:
             self.window.set_transient_for(parent_window)
-        try:
-            self.add_itself_to_menu()
-        except:
-            pass
+        self.add_itself_to_menu()
         self.window.show()
 
     def on_delete_event(self,obj,b):
@@ -1051,10 +1036,7 @@ class GlobalMediaProperties:
 
     def close(self,obj):
         self.close_child_windows()
-        try:
-            self.remove_itself_from_menu()
-        except:
-            pass
+        self.remove_itself_from_menu()
         self.window.destroy()
 
     def close_child_windows(self):