diff --git a/openlp/core/ui/maindisplay.py b/openlp/core/ui/maindisplay.py
index 3dfde8640..bae00c2da 100644
--- a/openlp/core/ui/maindisplay.py
+++ b/openlp/core/ui/maindisplay.py
@@ -72,7 +72,7 @@ class MainDisplay(DisplayWidget):
         self.setWindowIcon(mainIcon)
         self.retranslateUi()
         self.setStyleSheet(u'border: 0px; margin: 0px; padding: 0px;')
-        self.setWindowFlags(QtCore.Qt.FramelessWindowHint |
+        self.setWindowFlags(QtCore.Qt.FramelessWindowHint | QtCore.Qt.Tool |
             QtCore.Qt.WindowStaysOnTopHint)
         if self.isLive:
             QtCore.QObject.connect(Receiver.get_receiver(),
diff --git a/openlp/plugins/songs/lib/mediaitem.py b/openlp/plugins/songs/lib/mediaitem.py
index d5cd49cbb..66cff169f 100644
--- a/openlp/plugins/songs/lib/mediaitem.py
+++ b/openlp/plugins/songs/lib/mediaitem.py
@@ -378,10 +378,12 @@ class SongMediaItem(MediaManagerItem):
         raw_footer.append(song.title)
         raw_footer.append(author_list)
         raw_footer.append(song.copyright)
-        raw_footer.append(unicode(
-            translate('SongsPlugin.MediaItem', 'CCLI License: ') +
-            QtCore.QSettings().value(u'general/ccli number',
-            QtCore.QVariant(u'')).toString()))
+        if QtCore.QSettings().value(u'general/ccli number',
+            QtCore.QVariant(u'')).toString():
+            raw_footer.append(unicode(
+                translate('SongsPlugin.MediaItem', 'CCLI License: ') +
+                QtCore.QSettings().value(u'general/ccli number',
+                QtCore.QVariant(u'')).toString()))
         service_item.raw_footer = raw_footer
         service_item.audit = [
             song.title, author_audit, song.copyright, unicode(song.ccli_number)