diff --git a/ChangeLog b/ChangeLog
index 11f5cc3df..5d2c3d292 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,5 @@
 2006-05-06  Don Allingham  <don@gramps-project.org>
+	* src/DataViews/_PersonView.py: handle filter option correctly
 	* src/DisplayTabs/_SourceEmbedList.py: fix icon
 	* src/DisplayState.py: add relationship calculator option to statusbar
 
diff --git a/src/DataViews/_PersonView.py b/src/DataViews/_PersonView.py
index 226ef6268..c4a3876f9 100644
--- a/src/DataViews/_PersonView.py
+++ b/src/DataViews/_PersonView.py
@@ -129,7 +129,7 @@ class PersonView(PageView.PersonNavView):
         self.add_action('Jump', None, _("_Jump"),
                         accel="<control>j",callback=self.jumpto)
 
-        self.add_toggle_action('Filter', None, _('_Hide Filters'), None, None,
+        self.add_toggle_action('Filter', None, _('_Show filter sidebar'), None, None,
                                self.filter_toggle, Config.get(Config.FILTER))
         self.add_action('ColumnEdit', gtk.STOCK_PROPERTIES,
                         _('_Column Editor'), callback=self.column_editor,)
@@ -422,19 +422,22 @@ class PersonView(PageView.PersonNavView):
             self.dirty = True
 
         if Config.get(Config.FILTER):
-            self.generic_filter_widget.show()
-            self.filter_pane.hide()
-        else:
             self.generic_filter_widget.hide()
             self.filter_pane.show()
+        else:
+            self.generic_filter_widget.show()
+            self.filter_pane.hide()
 
     def filter_toggle(self,obj):
         if obj.get_active():
-            self.generic_filter_widget.show()
-            self.filter_pane.hide()
-        else:
             self.generic_filter_widget.hide()
             self.filter_pane.show()
+            active = True
+        else:
+            self.generic_filter_widget.show()
+            self.filter_pane.hide()
+            active = False
+        Config.set(Config.FILTER, active)
 
     def add(self,obj):
         person = RelLib.Person()