diff --git a/ChangeLog b/ChangeLog
index 60993fb21..3547ab2b9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,7 +4,8 @@
 	constructor. Connect to the handling function on button press over the
 	canvas to enable context menu; 
 	(on_canvas_press, build_nav_menu): Add functions to enable context menu.
-	* src/gramps_main.py (init_interface): Call PedView with self as parent.
+	* src/gramps_main.py (init_interface): Call PedView with self as parent;
+	(set_buttons,change_active_person): Fix enabling the buttons. 
 	* src/PlaceView.py (merge): Change error message from people to places.
 
 2003-08-24  Don Allingham  <dallingham@users.sourceforge.net>
diff --git a/src/gramps_main.py b/src/gramps_main.py
index 926b4186f..cd69f89f7 100755
--- a/src/gramps_main.py
+++ b/src/gramps_main.py
@@ -463,8 +463,9 @@ class Gramps:
         self.tools_menu.set_sensitive(val)
         self.report_button.set_sensitive(val)
         self.tool_button.set_sensitive(val)
-        self.remove_button.set_sensitive(val)
-        self.edit_button.set_sensitive(val)
+        if self.views.get_current_page() == 0:
+            self.remove_button.set_sensitive(val)
+            self.edit_button.set_sensitive(val)
         
     def redraw_histmenu(self):
         """Create the history submenu of the Go menu"""
@@ -1644,11 +1645,10 @@ class Gramps:
                     self.backbtn.set_sensitive(0)
                     self.back.set_sensitive(0)
      
-        if self.views.get_current_page == 1:
-            if person:
-                self.set_buttons(1)
-            else:
-                self.set_buttons(0)
+        if person:
+            self.set_buttons(1)
+        else:
+            self.set_buttons(0)
         
     def modify_statusbar(self):