diff --git a/ChangeLog b/ChangeLog
index dc7410974..98e483fa5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-12-23  Alex Roitman  <shura@gramps-project.org>
+	* src/EditPerson.py: Swap menu/submenu labels.
+	* src/EventEdit.py: Menu label fixes.
+
 2005-12-22  Don Allingham  <don@gramps-project.org>
 	* src/AddrEdit.py: More window management
 	* src/AttrEdit.py: More window management
diff --git a/src/EditPerson.py b/src/EditPerson.py
index 966036d3a..0c22e6a56 100644
--- a/src/EditPerson.py
+++ b/src/EditPerson.py
@@ -454,7 +454,7 @@ class EditPerson(DisplayState.ManagedWindow):
         win_menu_label = self.nd.display(person)
         if not win_menu_label.strip():
             win_menu_label = _("New Person")
-        return (win_menu_label,_('Edit Person'))
+        return (_('Edit Person'),win_menu_label)
 
     def build_window_key(self,obj):
         if obj:
diff --git a/src/EventEdit.py b/src/EventEdit.py
index babf0894e..37a2379bb 100644
--- a/src/EventEdit.py
+++ b/src/EventEdit.py
@@ -266,10 +266,17 @@ class EventEditor(DisplayState.ManagedWindow):
 
     def build_menu_names(self,event):
         if event:
-            win_menu_label = event.get_type()[1]
-        if not win_menu_label.strip():
-            win_menu_label = _("New Place")
-        return (win_menu_label,_('Edit Place'))
+            if event.get_type()[0] == RelLib.Event.CUSTOM:
+                event_name = event.get_type()[1]
+            else:
+                try:
+                    event_name = Utils.personal_events[event.get_type()[0]]
+                except:
+                    event_name = Utils.family_events[event.get_type()[0]]
+            submenu_label = _('Event: %s')  % event_name
+        else:
+            submenu_label = _('New Event')
+        return (_('Event Editor'),submenu_label)
 
     def build_window_key(self,obj):
         if obj:
@@ -564,7 +571,7 @@ class EventRefEditor(DisplayState.ManagedWindow):
             submenu_label = _('Event: %s')  % event_name
         else:
             submenu_label = _('New Event')
-        menu_label = _('Event Reference Editor')
+        return (_('Event Reference Editor'),submenu_label)
         
     def build_window_key(self,eventref):
         if self.event: