diff --git a/openlp/core/ui/generaltab.py b/openlp/core/ui/generaltab.py
index 2f0b459ca..e44023690 100644
--- a/openlp/core/ui/generaltab.py
+++ b/openlp/core/ui/generaltab.py
@@ -38,7 +38,7 @@ class GeneralTab(SettingsTab):
         """
         self.screens = screens
         self.monitorNumber = 0
-        # Set to true to allow PostSetUp to work first time
+        # Set to True to allow PostSetup to work on application start up
         self.overrideChanged = True
         SettingsTab.__init__(self, u'General')
 
diff --git a/openlp/plugins/songs/forms/songmaintenanceform.py b/openlp/plugins/songs/forms/songmaintenanceform.py
index da4351fbc..83dba85a2 100644
--- a/openlp/plugins/songs/forms/songmaintenanceform.py
+++ b/openlp/plugins/songs/forms/songmaintenanceform.py
@@ -113,6 +113,12 @@ class SongMaintenanceForm(QtGui.QDialog, Ui_SongMaintenanceDialog):
                     u'%s %s' % (author.first_name, author.last_name))
             author_name.setData(QtCore.Qt.UserRole, QtCore.QVariant(author.id))
             self.AuthorsListWidget.addItem(author_name)
+        if self.AuthorsListWidget.count() == 0:
+            self.AuthorDeleteButton.setEnabled(False)
+            self.AuthorEditButton.setEnabled(False)
+        else:
+            self.AuthorDeleteButton.setEnabled(True)
+            self.AuthorEditButton.setEnabled(True)
 
     def resetTopics(self):
         """
@@ -125,6 +131,12 @@ class SongMaintenanceForm(QtGui.QDialog, Ui_SongMaintenanceDialog):
             topic_name = QtGui.QListWidgetItem(topic.name)
             topic_name.setData(QtCore.Qt.UserRole, QtCore.QVariant(topic.id))
             self.TopicsListWidget.addItem(topic_name)
+        if self.TopicsListWidget.count() == 0:
+            self.TopicDeleteButton.setEnabled(False)
+            self.TopicEditButton.setEnabled(False)
+        else:
+            self.TopicDeleteButton.setEnabled(True)
+            self.TopicEditButton.setEnabled(True)
 
     def resetBooks(self):
         """
@@ -137,6 +149,12 @@ class SongMaintenanceForm(QtGui.QDialog, Ui_SongMaintenanceDialog):
                 book.publisher))
             book_name.setData(QtCore.Qt.UserRole, QtCore.QVariant(book.id))
             self.BooksListWidget.addItem(book_name)
+        if self.BooksListWidget.count() == 0:
+            self.BookDeleteButton.setEnabled(False)
+            self.BookEditButton.setEnabled(False)
+        else:
+            self.BookDeleteButton.setEnabled(True)
+            self.BookEditButton.setEnabled(True)
 
     def checkAuthor(self, new_author, edit=False):
         """