diff --git a/src/calibre/gui2/actions/view.py b/src/calibre/gui2/actions/view.py
index 758aaa0e0a..5f4f7ce428 100644
--- a/src/calibre/gui2/actions/view.py
+++ b/src/calibre/gui2/actions/view.py
@@ -35,7 +35,6 @@ class ViewAction(InterfaceAction):
         self.qaction.setMenu(self.view_menu)
         ac.triggered.connect(self.view_specific_format, type=Qt.QueuedConnection)
 
-
     def location_selected(self, loc):
         enabled = loc == 'library'
         for action in list(self.view_menu.actions())[1:]:
@@ -134,6 +133,9 @@ class ViewAction(InterfaceAction):
         rows = self.gui.current_view().selectionModel().selectedRows()
         self._view_books(rows)
 
+    def view_triggered(self, index):
+        self._view_books([index])
+
     def view_specific_book(self, index):
         self._view_books([index])
 
diff --git a/src/calibre/gui2/library/views.py b/src/calibre/gui2/library/views.py
index 1c2a541116..525b10eaa1 100644
--- a/src/calibre/gui2/library/views.py
+++ b/src/calibre/gui2/library/views.py
@@ -50,6 +50,8 @@ class BooksView(QTableView): # {{{
     def __init__(self, parent, modelcls=BooksModel):
         QTableView.__init__(self, parent)
 
+        self.setEditTriggers(self.SelectedClicked|self.EditKeyPressed)
+
         self.drag_allowed = True
         self.setDragEnabled(True)
         self.setDragDropOverwriteMode(False)
@@ -98,6 +100,8 @@ class BooksView(QTableView): # {{{
         self._model.about_to_be_sorted.connect(self.about_to_be_sorted)
         self._model.sorting_done.connect(self.sorting_done)
 
+        self.doubleClicked.connect(parent.iactions['View'].view_triggered)
+
     # Column Header Context Menu {{{
     def column_header_context_handler(self, action=None, column=None):
         if not action or not column:
diff --git a/src/calibre/manual/gui.rst b/src/calibre/manual/gui.rst
index 377c409bd0..4d75400b7d 100644
--- a/src/calibre/manual/gui.rst
+++ b/src/calibre/manual/gui.rst
@@ -338,6 +338,8 @@ Calibre has several keyboard shortcuts to save you time and mouse movement. Thes
 
     * - Keyboard Shortcut
       - Action
+    * - :kbd:`F2 (Enter in OS X)`
+      - Edit the metadata of the currently selected field in the book list.
     * - :kbd:`A` 
       - Add Books
     * - :kbd:`C`