diff --git a/ChangeLog b/ChangeLog
index cf7827d6e..c85d8de22 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-02-19 Benny Malengier b <benny.malengier@gramps-project.org>
+	* src/Bookmarks.py:
+	* src/gramps_main.py:
+	* src/PageView.py:
+	Don't edit bookmarks, organize them, key: shift+ctrl+b
+
 2008-02-19 Benny Malengier <benny.malengier@gramps-project.org>
 	* src/ViewManager.py: CTRL+B as accel for clipboard
 
diff --git a/src/Bookmarks.py b/src/Bookmarks.py
index 5d5a36cab..901c1f47d 100644
--- a/src/Bookmarks.py
+++ b/src/Bookmarks.py
@@ -189,14 +189,14 @@ class Bookmarks :
 
     def draw_window(self):
         """Draws the bookmark dialog box"""
-        title = "%s - GRAMPS" % _("Edit Bookmarks")
+        title = _("%(title)s - GRAMPS") % {'title': _("Organize Bookmarks")}
         self.top = gtk.Dialog(title)
         self.top.set_default_size(400, 350)
         self.top.set_modal(True)
         self.top.set_has_separator(False)
         self.top.vbox.set_spacing(5)
         label = gtk.Label('<span size="larger" weight="bold">%s</span>'
-                          % _("Edit Bookmarks"))
+                          % _("Organize Bookmarks"))
         label.set_use_markup(True)
         self.top.vbox.pack_start(label, 0, 0, 5)
         box = gtk.HBox()
diff --git a/src/PageView.py b/src/PageView.py
index f616c84fc..6d57f6c03 100644
--- a/src/PageView.py
+++ b/src/PageView.py
@@ -350,8 +350,9 @@ class BookMarkView(PageView):
         self.book_action.add_actions([
             ('AddBook', 'gramps-bookmark-new', _('_Add Bookmark'), 
              '<control>d', None, self.add_bookmark), 
-            ('EditBook', 'gramps-bookmark-edit', _('_Edit Bookmarks'), 
-             '<control>b', None, 
+            ('EditBook', 'gramps-bookmark-edit', 
+             _("%(title)s...") % {'title': _("Organize Bookmarks")}, 
+             '<shift><control>b', None, 
              self.edit_bookmarks), 
             ])
 
diff --git a/src/gramps_main.py b/src/gramps_main.py
index 377bb9a46..dffa64750 100644
--- a/src/gramps_main.py
+++ b/src/gramps_main.py
@@ -98,7 +98,7 @@ def register_stock_icons ():
         ('gramps-attribute', _('Attribute'), gtk.gdk.CONTROL_MASK, 0, ''), 
         #('gramps-bookmark', _('Bookmarks'), gtk.gdk.CONTROL_MASK, 0, ''), 
         #('gramps-bookmark-delete', _('Delete bookmark'), gtk.gdk.CONTROL_MASK, 0, ''), 
-        ('gramps-bookmark-edit', _('Edit Bookmarks'), gtk.gdk.CONTROL_MASK, 0, ''), 
+        ('gramps-bookmark-edit', _('Organize Bookmarks'), gtk.gdk.CONTROL_MASK, 0, ''), 
         ('gramps-bookmark-new', _('Add Bookmark'), gtk.gdk.CONTROL_MASK, 0, ''), 
         ('gramps-date', _('Date'), gtk.gdk.CONTROL_MASK, 0, ''), 
         ('gramps-date-edit', _('Edit Date'), gtk.gdk.CONTROL_MASK, 0, ''),