diff --git a/openlp/core/ui/mainwindow.py b/openlp/core/ui/mainwindow.py
index 11727f4ae..09e2ec9e7 100644
--- a/openlp/core/ui/mainwindow.py
+++ b/openlp/core/ui/mainwindow.py
@@ -672,12 +672,15 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
                          'The Main Display has been blanked out'))
 
     def onErrorMessage(self, data):
+        Receiver.send_message(u'close_splash')
         QtGui.QMessageBox.critical(self, data[u'title'], data[u'message'])
 
     def onWarningMessage(self, data):
+        Receiver.send_message(u'close_splash')
         QtGui.QMessageBox.warning(self, data[u'title'], data[u'message'])
 
     def onInformationMessage(self, data):
+        Receiver.send_message(u'close_splash')
         QtGui.QMessageBox.information(self, data[u'title'], data[u'message'])
 
     def onHelpWebSiteClicked(self):
diff --git a/openlp/core/ui/splashscreen.py b/openlp/core/ui/splashscreen.py
index 84aa1d7df..2bb516d00 100644
--- a/openlp/core/ui/splashscreen.py
+++ b/openlp/core/ui/splashscreen.py
@@ -23,6 +23,7 @@
 # with this program; if not, write to the Free Software Foundation, Inc., 59  #
 # Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
 ###############################################################################
+from openlp.core.lib import Receiver
 
 from PyQt4 import QtCore, QtGui
 
@@ -30,6 +31,8 @@ class SplashScreen(QtGui.QSplashScreen):
     def __init__(self):
         QtGui.QSplashScreen.__init__(self)
         self.setupUi()
+        QtCore.QObject.connect(Receiver.get_receiver(),
+            QtCore.SIGNAL(u'close_splash'), self.close)
 
     def setupUi(self):
         self.setObjectName(u'splash_screen')