diff --git a/src/calibre/gui2/dialogs/metadata_bulk.py b/src/calibre/gui2/dialogs/metadata_bulk.py
index a9e45087fd..1e3576e333 100644
--- a/src/calibre/gui2/dialogs/metadata_bulk.py
+++ b/src/calibre/gui2/dialogs/metadata_bulk.py
@@ -167,7 +167,8 @@ class MetadataBulkDialog(QDialog, Ui_MetadataBulkDialog):
         self.tag_editor_button.clicked.connect(self.tag_editor)
         self.autonumber_series.stateChanged[int].connect(self.auto_number_changed)
 
-        if len(db.custom_column_label_map) == 0:
+        if len([k for k in db.custom_field_metadata().values()
+                                    if k['datatype'] != 'composite']) == 0:
             self.central_widget.removeTab(1)
         else:
             self.create_custom_column_editors()
diff --git a/src/calibre/gui2/preferences/columns.py b/src/calibre/gui2/preferences/columns.py
index c1b9230f42..03a50e6f3a 100644
--- a/src/calibre/gui2/preferences/columns.py
+++ b/src/calibre/gui2/preferences/columns.py
@@ -21,7 +21,7 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form):
     def genesis(self, gui):
         self.gui = gui
         db = self.gui.library_view.model().db
-        self.custcols = copy.deepcopy(db.field_metadata.get_custom_field_metadata())
+        self.custcols = copy.deepcopy(db.field_metadata.custom_field_metadata())
 
         self.column_up.clicked.connect(self.up_column)
         self.column_down.clicked.connect(self.down_column)