diff --git a/ChangeLog b/ChangeLog
index 8037336bb..c0f7326cf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2008-02-20 Benny Malengier <benny.malengier@gramps-project.org>
+	* src/DbManager.py: #1725, ENTER, double-click if OK button sensitive only
+
 2008-02-19 Brian Matherly <brian@gramps-project.org>
 	* src/plugins/Summary.py:
 	* src/plugins/CountAncestors.py:
diff --git a/src/DbManager.py b/src/DbManager.py
index 9ba37ac9d..1af9a9d7f 100644
--- a/src/DbManager.py
+++ b/src/DbManager.py
@@ -324,7 +324,8 @@ class DbManager(CLIDbManager):
         to make sure that an item was selected first.
         """
         if event.type == gtk.gdk._2BUTTON_PRESS and event.button == 1:
-            return self.__load_selected()
+            if self.connect.get_property('sensitive'):
+                return self.__load_selected()
         return False
 
     def __load_selected(self):
@@ -353,7 +354,8 @@ class DbManager(CLIDbManager):
         """
         if not event.state or event.state in (gtk.gdk.MOD2_MASK,):
             if event.keyval in (_RETURN, _KP_ENTER):
-                return self.__load_selected()
+                if self.connect.get_property('sensitive'):
+                    return self.__load_selected()
         return False
 
     def __selection_changed(self, selection):