diff --git a/openlp/plugins/songs/forms/editsongdialog.py b/openlp/plugins/songs/forms/editsongdialog.py
index 4714ab093..b9b6e5baf 100644
--- a/openlp/plugins/songs/forms/editsongdialog.py
+++ b/openlp/plugins/songs/forms/editsongdialog.py
@@ -111,14 +111,8 @@ class Ui_EditSongDialog(object):
         self.authorsLayout.setObjectName(u'authorsLayout')
         self.authorAddLayout = QtGui.QHBoxLayout()
         self.authorAddLayout.setObjectName(u'authorAddLayout')
-        self.authorsComboBox = QtGui.QComboBox(self.authorsGroupBox)
-        self.authorsComboBox.setSizeAdjustPolicy(
-            QtGui.QComboBox.AdjustToMinimumContentsLength)
-        self.authorsComboBox.setSizePolicy(
-            QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Fixed)
-        self.authorsComboBox.setEditable(True)
-        self.authorsComboBox.setInsertPolicy(QtGui.QComboBox.NoInsert)
-        self.authorsComboBox.setObjectName(u'authorsComboBox')
+        self.authorsComboBox = editSongDialogComboBox(
+            self.authorsGroupBox, u'authorsComboBox')
         self.authorAddLayout.addWidget(self.authorsComboBox)
         self.authorAddButton = QtGui.QPushButton(self.authorsGroupBox)
         self.authorAddButton.setObjectName(u'authorAddButton')
@@ -152,14 +146,8 @@ class Ui_EditSongDialog(object):
         self.topicsLayout.setObjectName(u'topicsLayout')
         self.topicAddLayout = QtGui.QHBoxLayout()
         self.topicAddLayout.setObjectName(u'topicAddLayout')
-        self.topicsComboBox = QtGui.QComboBox(self.topicsGroupBox)
-        self.topicsComboBox.setSizeAdjustPolicy(
-            QtGui.QComboBox.AdjustToMinimumContentsLength)
-        self.topicsComboBox.setSizePolicy(
-            QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Fixed)
-        self.topicsComboBox.setEditable(True)
-        self.topicsComboBox.setInsertPolicy(QtGui.QComboBox.NoInsert)
-        self.topicsComboBox.setObjectName(u'topicsComboBox')
+        self.topicsComboBox = editSongDialogComboBox(
+            self.topicsGroupBox, u'topicsComboBox')
         self.topicAddLayout.addWidget(self.topicsComboBox)
         self.topicAddButton = QtGui.QPushButton(self.topicsGroupBox)
         self.topicAddButton.setObjectName(u'topicAddButton')
@@ -183,14 +171,8 @@ class Ui_EditSongDialog(object):
         self.songBookLayout.setObjectName(u'songBookLayout')
         self.songBookNameLabel = QtGui.QLabel(self.songBookGroupBox)
         self.songBookNameLabel.setObjectName(u'songBookNameLabel')
-        self.songBookComboBox = QtGui.QComboBox(self.songBookGroupBox)
-        self.songBookComboBox.setSizeAdjustPolicy(
-            QtGui.QComboBox.AdjustToMinimumContentsLength)
-        self.songBookComboBox.setSizePolicy(
-            QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Fixed)
-        self.songBookComboBox.setEditable(True)
-        self.songBookComboBox.setInsertPolicy(QtGui.QComboBox.NoInsert)
-        self.songBookComboBox.setObjectName(u'songBookComboBox')
+        self.songBookComboBox = editSongDialogComboBox(
+            self.songBookGroupBox, u'songBookComboBox')
         self.songBookNameLabel.setBuddy(self.songBookComboBox)
         self.songBookLayout.addRow(self.songBookNameLabel,
             self.songBookComboBox)
@@ -215,14 +197,8 @@ class Ui_EditSongDialog(object):
         self.themeGroupBox.setObjectName(u'themeGroupBox')
         self.themeLayout = QtGui.QHBoxLayout(self.themeGroupBox)
         self.themeLayout.setObjectName(u'themeLayout')
-        self.themeComboBox = QtGui.QComboBox(self.themeGroupBox)
-        self.themeComboBox.setSizeAdjustPolicy(
-            QtGui.QComboBox.AdjustToMinimumContentsLength)
-        self.themeComboBox.setSizePolicy(
-            QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Fixed)
-        self.themeComboBox.setEditable(True)
-        self.themeComboBox.setInsertPolicy(QtGui.QComboBox.NoInsert)
-        self.themeComboBox.setObjectName(u'themeComboBox')
+        self.themeComboBox = editSongDialogComboBox(
+            self.themeGroupBox, u'themeComboBox')
         self.themeLayout.addWidget(self.themeComboBox)
         self.themeAddButton = QtGui.QPushButton(self.themeGroupBox)
         self.themeAddButton.setObjectName(u'themeAddButton')
@@ -331,3 +307,15 @@ class Ui_EditSongDialog(object):
             self.songTabWidget.indexOf(self.themeTab),
             translate('SongsPlugin.EditSongForm',
                 'Theme, Copyright Info && Comments'))
+
+def editSongDialogComboBox(parent, name):
+    """
+    Utility method to generate a standard combo box for this dialog.
+    """
+    comboBox = QtGui.QComboBox(parent)
+    comboBox.setSizeAdjustPolicy(QtGui.QComboBox.AdjustToMinimumContentsLength)
+    comboBox.setSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Fixed)
+    comboBox.setEditable(True)
+    comboBox.setInsertPolicy(QtGui.QComboBox.NoInsert)
+    comboBox.setObjectName(name)
+    return comboBox