diff --git a/ChangeLog b/ChangeLog
index 30eb3ccca..63db4c19b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-10-20  Benny Malengier  <benny.malengier@gramps-project.org>
+	* src/DisplayTabs/_BackRefModel.py: allow repository in backref (backref of note)
+	* src/DisplayTabs/_BackRefList.py: allow edit of repository from backrefs
+
 2007-10-20  Benny Malengier  <benny.malengier@gramps-project.org>
 	* README: gramps 3.0 requires python 2.5
 
diff --git a/src/DisplayTabs/_BackRefList.py b/src/DisplayTabs/_BackRefList.py
index 76a86926b..a9f6e4522 100644
--- a/src/DisplayTabs/_BackRefList.py
+++ b/src/DisplayTabs/_BackRefList.py
@@ -165,3 +165,11 @@ class BackRefList(EmbeddedList):
                 EditEvent(self.dbstate, self.uistate, [], event)
             except Errors.WindowActiveError:
                 pass
+        elif reftype == 'Repository':
+            try:
+                from Editors import EditRepository
+                
+                repo = self.dbstate.db.get_repository_from_handle(ref)
+                EditRepository(self.dbstate, self.uistate, [], repo)
+            except Errors.WindowActiveError:
+                pass
diff --git a/src/DisplayTabs/_BackRefModel.py b/src/DisplayTabs/_BackRefModel.py
index 4d7f4fb6a..d0ecc00ba 100644
--- a/src/DisplayTabs/_BackRefModel.py
+++ b/src/DisplayTabs/_BackRefModel.py
@@ -87,6 +87,11 @@ class BackRefModel(gtk.ListStore):
                 name = p.get_title()
                 gid = p.gramps_id
                 handle = p.handle
+            elif dtype == 'Repository':
+                p = self.db.get_repository_from_handle(ref[1])
+                name = p.get_name()
+                gid = p.gramps_id
+                handle = p.handle
             else:
                 p = self.db.get_object_from_handle(ref[1])
                 name = p.get_description()