diff --git a/openlp/plugins/custom/forms/editcustomform.py b/openlp/plugins/custom/forms/editcustomform.py
index 5a23e2066..0e4376634 100644
--- a/openlp/plugins/custom/forms/editcustomform.py
+++ b/openlp/plugins/custom/forms/editcustomform.py
@@ -116,7 +116,7 @@ class EditCustomForm(QtGui.QDialog, Ui_CustomEditDialog):
         log.debug(u'accept')
         if self.saveCustom():
             Receiver.send_message(u'custom_set_autoselect_item',
-                self.customSlide.title)
+                self.customSlide.id)
             Receiver.send_message(u'custom_load_list')
             QtGui.QDialog.accept(self)
 
diff --git a/openlp/plugins/custom/lib/mediaitem.py b/openlp/plugins/custom/lib/mediaitem.py
index 91af98bea..43f4afd63 100644
--- a/openlp/plugins/custom/lib/mediaitem.py
+++ b/openlp/plugins/custom/lib/mediaitem.py
@@ -147,7 +147,7 @@ class CustomMediaItem(MediaManagerItem):
                 QtCore.Qt.UserRole, QtCore.QVariant(custom_slide.id))
             self.listView.addItem(custom_name)
             # Auto-select the item if name has been set
-            if custom_slide.title == self.autoSelectItem:
+            if custom_slide.id == self.autoSelectItem:
                 self.listView.setCurrentItem(custom_name)
 
     def onNewClick(self):
diff --git a/openlp/plugins/songs/forms/editsongform.py b/openlp/plugins/songs/forms/editsongform.py
index ba4afdfe7..393009f82 100644
--- a/openlp/plugins/songs/forms/editsongform.py
+++ b/openlp/plugins/songs/forms/editsongform.py
@@ -696,9 +696,9 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog):
         self.clearCaches()
         if self._validate_song():
             self.saveSong()
-            Receiver.send_message(u'songs_set_autoselect_item',
-                unicode(self.titleEdit.text()))
+            Receiver.send_message(u'songs_set_autoselect_item',self.song.id)
             Receiver.send_message(u'songs_load_list')
+            self.song = None
             QtGui.QDialog.accept(self)
 
     def saveSong(self, preview=False):
@@ -756,8 +756,6 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog):
             self.song.topics.append(self.manager.get_object(Topic, topicId))
         clean_song(self.manager, self.song)
         self.manager.save_object(self.song)
-        if not preview:
-            self.song = None
 
     def _processLyrics(self):
         """
diff --git a/openlp/plugins/songs/lib/mediaitem.py b/openlp/plugins/songs/lib/mediaitem.py
index cc36f983a..7fe4d45c4 100644
--- a/openlp/plugins/songs/lib/mediaitem.py
+++ b/openlp/plugins/songs/lib/mediaitem.py
@@ -245,7 +245,7 @@ class SongMediaItem(MediaManagerItem):
             song_name.setData(QtCore.Qt.UserRole, QtCore.QVariant(song.id))
             self.listView.addItem(song_name)
             # Auto-select the item if name has been set
-            if song.title == self.autoSelectItem :
+            if song.id == self.autoSelectItem :
                 self.listView.setCurrentItem(song_name)
 
     def displayResultsAuthor(self, searchresults):