diff --git a/resources/default_tweaks.py b/resources/default_tweaks.py
index d01999e766..efcd004acd 100644
--- a/resources/default_tweaks.py
+++ b/resources/default_tweaks.py
@@ -265,8 +265,10 @@ generate_cover_title_font = None
 generate_cover_foot_font = None
 
 
-# Behavior of doubleclick on the books list. Choices:
-# open_viewer, do_nothing, edit_cell. Default: open_viewer.
+# Behavior of doubleclick on the books list. Choices: open_viewer, do_nothing,
+# edit_cell, edit_metadata. Selecting edit_metadata has the side effect of
+# disabling editing a field using a single click.
+# Default: open_viewer.
 # Example: doubleclick_on_library_view = 'do_nothing'
 doubleclick_on_library_view = 'open_viewer'
 
diff --git a/src/calibre/gui2/library/views.py b/src/calibre/gui2/library/views.py
index a6285c6656..8dad4c21b1 100644
--- a/src/calibre/gui2/library/views.py
+++ b/src/calibre/gui2/library/views.py
@@ -57,6 +57,11 @@ class BooksView(QTableView): # {{{
         elif tweaks['doubleclick_on_library_view'] == 'open_viewer':
             self.setEditTriggers(self.SelectedClicked|self.editTriggers())
             self.doubleClicked.connect(parent.iactions['View'].view_triggered)
+        elif tweaks['doubleclick_on_library_view'] == 'edit_metadata':
+            # Must not enable single-click to edit, or the field will remain
+            # open in edit mode underneath the edit metadata dialog
+            self.doubleClicked.connect(
+                        partial(parent.iactions['Edit Metadata'].edit_metadata, checked=False))
 
         self.drag_allowed = True
         self.setDragEnabled(True)