diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog
index 49581a8b3..a42bc53d6 100644
--- a/gramps2/ChangeLog
+++ b/gramps2/ChangeLog
@@ -14,6 +14,10 @@
 	* src/ChooseParents.py (mother_list_select_row,
 	father_list_select_row): Comment out auto-selection of parents.
 
+	* src/plugins/FilterEditor.py (on_delete_event,close_filter_editor):
+	Update filter ComboBox in the main window.
+	* src/gramps_main.py (init_filters): Clear layout before rebuilding.
+
 2005-03-07 Alex Roitman  <shura@alex.neuro.umn.edu>
 	* src/AddrEdit.py: Typo.
 	* src/EditPerson.py (on_add_addr_clicked): Typos.
diff --git a/gramps2/src/gramps_main.py b/gramps2/src/gramps_main.py
index 61a16875d..a118d386e 100755
--- a/gramps2/src/gramps_main.py
+++ b/gramps2/src/gramps_main.py
@@ -856,6 +856,7 @@ class Gramps:
     def init_filters(self):
 
         cell = gtk.CellRendererText()
+        self.filter_list.clear()
         self.filter_list.pack_start(cell,True)
         self.filter_list.add_attribute(cell,'text',0)
 
@@ -886,8 +887,6 @@ class Gramps:
         all.add_rule(GenericFilter.SearchName([]))
         filter_list.append(all)
 
-        menu = GenericFilter.build_filter_menu(filter_list)
-        
         self.filter_model = GenericFilter.FilterStore(filter_list)
         self.filter_list.set_model(self.filter_model)
         self.filter_list.set_active(self.filter_model.default_index())
diff --git a/gramps2/src/plugins/FilterEditor.py b/gramps2/src/plugins/FilterEditor.py
index 651b86950..a83229b10 100644
--- a/gramps2/src/plugins/FilterEditor.py
+++ b/gramps2/src/plugins/FilterEditor.py
@@ -301,6 +301,7 @@ class FilterEditor:
         self.remove_itself_from_menu()
         GenericFilter.reload_custom_filters()
         GenericFilter.reload_system_filters()
+        self.parent.init_filters()
 
     def close_child_windows(self):
         for child_window in self.child_windows.values():
@@ -346,6 +347,7 @@ class FilterEditor:
         self.window.destroy()
         GenericFilter.reload_custom_filters()
         GenericFilter.reload_system_filters()
+        self.parent.init_filters()
         
     def draw_filters(self):
         self.clist.clear()