diff --git a/openlp/core/lib/mediamanageritem.py b/openlp/core/lib/mediamanageritem.py
index d18bb5843..5c2f0eec6 100644
--- a/openlp/core/lib/mediamanageritem.py
+++ b/openlp/core/lib/mediamanageritem.py
@@ -24,7 +24,6 @@
 
 import types
 import os
-import uuid
 
 from PyQt4 import QtCore, QtGui
 
@@ -113,6 +112,7 @@ class MediaManagerItem(QtGui.QWidget):
         if title:
             self.title = title
         self.Toolbar = None
+        self.remoteTriggered = None
         self.ServiceItemIconName = None
         self.PageLayout = QtGui.QVBoxLayout(self)
         self.PageLayout.setSpacing(0)
@@ -358,7 +358,7 @@ class MediaManagerItem(QtGui.QWidget):
             u'to be defined by the plugin')
 
     def onPreviewClick(self):
-        if not self.ListView.selectedIndexes():
+        if not self.ListView.selectedIndexes() and not self.remoteTriggered:
             QtGui.QMessageBox.information(self,
                 self.trUtf8(u'No items selected...'),
                 self.trUtf8(u'You must select one or more items'))
@@ -381,7 +381,7 @@ class MediaManagerItem(QtGui.QWidget):
             self.parent.live_controller.addServiceItem(service_item)
 
     def onAddClick(self):
-        if not self.ListView.selectedIndexes():
+        if not self.ListView.selectedIndexes() and not self.remoteTriggered:
             QtGui.QMessageBox.information(self,
                 self.trUtf8(u'No items selected...'),
                 self.trUtf8(u'You must select one or more items'))
@@ -389,7 +389,6 @@ class MediaManagerItem(QtGui.QWidget):
         service_item = self.buildServiceItem()
         if service_item:
             service_item.fromPlugin = False
-            service_item.uuid = unicode(uuid.uuid1())
             self.parent.service_manager.addServiceItem(service_item)
 
     def buildServiceItem(self):
diff --git a/openlp/core/lib/serviceitem.py b/openlp/core/lib/serviceitem.py
index 364b27f39..db147b786 100644
--- a/openlp/core/lib/serviceitem.py
+++ b/openlp/core/lib/serviceitem.py
@@ -25,6 +25,7 @@
 import logging
 import os
 import time
+import uuid
 
 from PyQt4 import QtGui
 
@@ -73,6 +74,7 @@ class ServiceItem(object):
         self.service_item_type = None
         self.editEnabled = False
         self.service_frames = []
+        self.uuid = unicode(uuid.uuid1())
 
     def addIcon(self, icon):
         """
diff --git a/openlp/plugins/songs/lib/mediaitem.py b/openlp/plugins/songs/lib/mediaitem.py
index a859bfabc..33ee028e2 100644
--- a/openlp/plugins/songs/lib/mediaitem.py
+++ b/openlp/plugins/songs/lib/mediaitem.py
@@ -55,7 +55,6 @@ class SongMediaItem(MediaManagerItem):
             self.parent.songmanager, self)
         # Holds information about whether the edit is remotly triggered and
         # which Song is required.
-        self.remoteTriggered = None
         self.remoteSong = -1
 
     def initPluginNameVisible(self):
@@ -180,7 +179,6 @@ class SongMediaItem(MediaManagerItem):
     def displayResultsSong(self, searchresults):
         log.debug(u'display results Song')
         self.ListView.clear()
-        #log.debug(u'Records returned from search %s", len(searchresults))
         for song in searchresults:
             author_list = u''
             for author in song.authors:
@@ -323,34 +321,3 @@ class SongMediaItem(MediaManagerItem):
         ]
         return True
 
-    def onPreviewClick(self):
-        if not self.remoteTriggered:
-            MediaManagerItem.onPreviewClick(self)
-        else:
-            log.debug(self.PluginNameShort + u' Preview Requested')
-            service_item = self.buildServiceItem()
-            if service_item:
-                service_item.fromPlugin = True
-                self.parent.preview_controller.addServiceItem(service_item)
-
-    def onLiveClick(self):
-        if not self.remoteTriggered:
-            MediaManagerItem.onLiveClick(self)
-        else:
-            log.debug(self.PluginNameShort + u' Live Requested')
-            service_item = self.buildServiceItem()
-            if service_item:
-                service_item.fromPlugin = True
-                service_item.uuid = unicode(uuid.uuid1())
-                self.parent.live_controller.addServiceItem(service_item)
-
-    def onAddClick(self):
-        if not self.remoteTriggered:
-            MediaManagerItem.onAddClick(self)
-        else:
-            log.debug(self.PluginNameShort + u' Add Requested')
-            service_item = self.buildServiceItem()
-            if service_item:
-                service_item.fromPlugin = False
-                service_item.uuid = unicode(uuid.uuid1())
-                self.parent.service_manager.addServiceItem(service_item)
diff --git a/version.txt b/version.txt
index a0da1a05a..a295a3301 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-1.9.0-653
+1.9.0-654