diff --git a/openlp.pyw b/openlp.pyw
index 888cdae9f..f3455962d 100755
--- a/openlp.pyw
+++ b/openlp.pyw
@@ -205,22 +205,20 @@ class OpenLP(QtGui.QApplication):
             self.exceptionForm = ExceptionForm(self.mainWindow)
         self.exceptionForm.exceptionTextEdit.setPlainText(
             ''.join(format_exception(exctype, value, traceback)))
+        self.setNormalCursor()
         self.exceptionForm.exec_()
 
     def setBusyCursor(self):
         """
-        Sets the Busy Cursor on the Main Window
+        Sets the Busy Cursor for the Application
         """
-        #a=c
         self.setOverrideCursor(QtCore.Qt.BusyCursor)
-        #self.processEvents()
 
     def setNormalCursor(self):
         """
-        Sets the Normal Cursor on the Main Window
+        Sets the Normal Cursor forthe Application
         """
         self.restoreOverrideCursor()
-        #self.processEvents()
 
 def main():
     """
diff --git a/openlp/core/lib/mediamanageritem.py b/openlp/core/lib/mediamanageritem.py
index 6147be608..a9484795b 100644
--- a/openlp/core/lib/mediamanageritem.py
+++ b/openlp/core/lib/mediamanageritem.py
@@ -349,11 +349,13 @@ class MediaManagerItem(QtGui.QWidget):
             self.OnNewFileMasks)
         log.info(u'New files(s) %s', unicode(files))
         if files:
+            Receiver.send_message(u'cursor_busy')
             self.loadList(files)
             lastDir = os.path.split(unicode(files[0]))[0]
             SettingsManager.set_last_dir(self.settingsSection, lastDir)
             SettingsManager.set_list(self.settingsSection,
                 self.settingsSection, self.getFileList())
+        Receiver.send_message(u'cursor_normal')
 
     def getFileList(self):
         """
diff --git a/openlp/plugins/images/lib/mediaitem.py b/openlp/plugins/images/lib/mediaitem.py
index 1c48e3eb6..7281bb091 100644
--- a/openlp/plugins/images/lib/mediaitem.py
+++ b/openlp/plugins/images/lib/mediaitem.py
@@ -139,7 +139,6 @@ class ImageMediaItem(MediaManagerItem):
                 self.settingsSection, self.getFileList())
 
     def loadList(self, list):
-        Receiver.send_message(u'cursor_busy')
         for file in list:
             filename = os.path.split(unicode(file))[1]
             thumb = os.path.join(self.servicePath, filename)
@@ -154,7 +153,6 @@ class ImageMediaItem(MediaManagerItem):
             item_name.setIcon(icon)
             item_name.setData(QtCore.Qt.UserRole, QtCore.QVariant(file))
             self.listView.addItem(item_name)
-        Receiver.send_message(u'cursor_normal')
 
     def generateSlideData(self, service_item, item=None, xmlVersion=False):
         items = self.listView.selectedIndexes()
diff --git a/openlp/plugins/presentations/lib/mediaitem.py b/openlp/plugins/presentations/lib/mediaitem.py
index 9b8c2c1a9..e832f1a10 100644
--- a/openlp/plugins/presentations/lib/mediaitem.py
+++ b/openlp/plugins/presentations/lib/mediaitem.py
@@ -171,7 +171,6 @@ class PresentationMediaItem(MediaManagerItem):
         This is called both on initial load of the plugin to populate with
         existing files, and when the user adds new files via the media manager
         """
-        Receiver.send_message(u'cursor_busy')
         currlist = self.getFileList()
         titles = []
         for file in currlist:
@@ -216,7 +215,6 @@ class PresentationMediaItem(MediaManagerItem):
             item_name.setData(QtCore.Qt.UserRole, QtCore.QVariant(file))
             item_name.setIcon(icon)
             self.listView.addItem(item_name)
-        Receiver.send_message(u'cursor_normal')
 
     def onDeleteClick(self):
         """