diff --git a/ChangeLog b/ChangeLog
index c6cf9ed86..b0e16dc6f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2006-11-08  Don Allingham  <don@gramps-project.org>
-	* src/DataViews/_RelationView.py: add toolbar buttons
+	* src/DataViews/_RelationView.py: add toolbar buttons, catch edit
+	button config value change
+	* src/GrampsCfg.py: reorder options
 	* src/images/Makefile.am: install new svg files
 	* src/images/parents.svg: button for toolbar
 	* src/images/spouse.svg: button for toolbar
diff --git a/src/DataViews/_RelationView.py b/src/DataViews/_RelationView.py
index 7e0dad7cc..e509c5b89 100644
--- a/src/DataViews/_RelationView.py
+++ b/src/DataViews/_RelationView.py
@@ -122,6 +122,8 @@ class RelationshipView(PageView.PersonNavView):
         self.child = None
         Config.client.notify_add("/apps/gramps/preferences/relation-shade",
                                  self.shade_update)
+        Config.client.notify_add("/apps/gramps/interface/editbutton",
+                                 self.config_update)
 
     def set_active(self):
         PageView.PersonNavView.set_active(self)
@@ -138,6 +140,9 @@ class RelationshipView(PageView.PersonNavView):
         self.uistate.modify_statusbar(self.dbstate)
         self.redraw()
 
+    def config_update(self, client, cnxn_id, entry, data):
+        self.redraw()
+
     def build_tree(self):
         self.redraw()
             
diff --git a/src/GrampsCfg.py b/src/GrampsCfg.py
index 2cda91449..4a0b089c6 100644
--- a/src/GrampsCfg.py
+++ b/src/GrampsCfg.py
@@ -494,16 +494,16 @@ class GrampsPreferences(ManagedWindow.ManagedWindow):
 
         self.add_checkbox(table, _('Automatically load last database'),
                           0, Config.AUTOLOAD)
-        self.add_checkbox(table, _('Add default source on import'),
-                          1, Config.DEFAULT_SOURCE)
-        self.add_checkbox(table, _('Enable spelling checker'),
-                          2, Config.SPELLCHECK)
-        self.add_checkbox(table, _('Display Tip of the Day'),
-                          3, Config.USE_TIPS)
-        self.add_checkbox(table, _('Use shading in Relationship View'),
-                          4, Config.RELATION_SHADE)
         self.add_checkbox(table, _('Enable database transactions'),
-                          5, Config.TRANSACTIONS)
+                          1, Config.TRANSACTIONS)
+        self.add_checkbox(table, _('Add default source on import'),
+                          2, Config.DEFAULT_SOURCE)
+        self.add_checkbox(table, _('Enable spelling checker'),
+                          3, Config.SPELLCHECK)
+        self.add_checkbox(table, _('Display Tip of the Day'),
+                          4, Config.USE_TIPS)
+        self.add_checkbox(table, _('Use shading in Relationship View'),
+                          5, Config.RELATION_SHADE)
         self.add_checkbox(table, _('Display edit buttons on Relationship View'),
                           6, Config.RELEDITBTN)