diff --git a/openlp/core/ui/advancedtab.py b/openlp/core/ui/advancedtab.py
index 0a8547837..dd196d68d 100644
--- a/openlp/core/ui/advancedtab.py
+++ b/openlp/core/ui/advancedtab.py
@@ -90,6 +90,10 @@ class AdvancedTab(SettingsTab):
         self.expandServiceItemCheckBox.setObjectName(
             u'expandServiceItemCheckBox')
         self.uiLayout.addWidget(self.expandServiceItemCheckBox)
+        self.enableAutoCloseCheckBox = QtGui.QCheckBox(self.uiGroupBox)
+        self.enableAutoCloseCheckBox.setObjectName(
+            u'enableAutoCloseCheckBox')
+        self.uiLayout.addWidget(self.enableAutoCloseCheckBox)
 #        self.sharedDirGroupBox = QtGui.QGroupBox(self.leftWidget)
 #        self.sharedDirGroupBox.setObjectName(u'sharedDirGroupBox')
 #        self.sharedDirGroupBox.setGeometry(QtCore.QRect(0, 65, 500, 85))
@@ -150,6 +154,8 @@ class AdvancedTab(SettingsTab):
             'Double-click to send items straight to live'))
         self.expandServiceItemCheckBox.setText(translate('OpenLP.AdvancedTab',
             'Expand new service items on creation'))
+        self.enableAutoCloseCheckBox.setText(translate('OpenLP.AdvancedTab',
+            'Enable application exit confirmation'))
 #        self.sharedDirGroupBox.setTitle(
 #            translate('AdvancedTab', 'Central Data Store'))
 #        self.sharedCheckBox.setText(
@@ -180,6 +186,9 @@ class AdvancedTab(SettingsTab):
         self.expandServiceItemCheckBox.setChecked(
             settings.value(u'expand service item',
             QtCore.QVariant(False)).toBool())
+        self.enableAutoCloseCheckBox.setChecked(
+            settings.value(u'enable exit confirmation',
+            QtCore.QVariant(True)).toBool())
         settings.endGroup()
 
     def save(self):
@@ -196,12 +205,14 @@ class AdvancedTab(SettingsTab):
             QtCore.QVariant(self.doubleClickLiveCheckBox.isChecked()))
         settings.setValue(u'expand service item',
             QtCore.QVariant(self.expandServiceItemCheckBox.isChecked()))
+        settings.setValue(u'enable exit confirmation',
+            QtCore.QVariant(self.enableAutoCloseCheckBox.isChecked()))
         settings.endGroup()
 
-    def onSharedCheckBoxChanged(self, checked):
-        """
-        Enables the widgets to allow a shared data location
-        """
-        self.sharedLabel.setEnabled(checked)
-        self.sharedTextEdit.setEnabled(checked)
-        self.sharedPushButton.setEnabled(checked)
\ No newline at end of file
+#    def onSharedCheckBoxChanged(self, checked):
+#        """
+#        Enables the widgets to allow a shared data location
+#        """
+#        self.sharedLabel.setEnabled(checked)
+#        self.sharedTextEdit.setEnabled(checked)
+#        self.sharedPushButton.setEnabled(checked)
\ No newline at end of file
diff --git a/openlp/core/ui/maindisplay.py b/openlp/core/ui/maindisplay.py
index dd24f172d..d243733dc 100644
--- a/openlp/core/ui/maindisplay.py
+++ b/openlp/core/ui/maindisplay.py
@@ -94,7 +94,6 @@ class MainDisplay(DisplayWidget):
     """
     This is the display screen.
     """
-
     def __init__(self, parent, screens, live):
         DisplayWidget.__init__(self, live, parent=None)
         self.parent = parent
@@ -116,7 +115,7 @@ class MainDisplay(DisplayWidget):
         """
         Set up and build the output screen
         """
-        log.debug(u'Setup live = %s for %s ' % (self.isLive,
+        log.debug(u'Setup live = %s for monitor %s ' % (self.isLive,
             self.screens.monitor_number))
         self.usePhonon = QtCore.QSettings().value(
             u'media/use phonon', QtCore.QVariant(True)).toBool()
diff --git a/openlp/core/ui/mainwindow.py b/openlp/core/ui/mainwindow.py
index 8c6117955..867fb3c51 100644
--- a/openlp/core/ui/mainwindow.py
+++ b/openlp/core/ui/mainwindow.py
@@ -842,7 +842,6 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
                     QtGui.QMessageBox.Save),
                 QtGui.QMessageBox.Save)
             if ret == QtGui.QMessageBox.Save:
-                #self.ServiceManagerContents.onSaveService(True)
                 if self.ServiceManagerContents.saveFile():
                     self.cleanUp()
                     event.accept()
@@ -854,18 +853,24 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
             else:
                 event.ignore()
         else:
-            ret = QtGui.QMessageBox.question(self,
-                translate('OpenLP.MainWindow', 'Close OpenLP'),
-                translate('OpenLP.MainWindow', 'Are you sure you want to close OpenLP?'),
-                QtGui.QMessageBox.StandardButtons(
-                    QtGui.QMessageBox.Yes |
-                    QtGui.QMessageBox.No),
-                QtGui.QMessageBox.Yes)
-            if ret == QtGui.QMessageBox.Yes:
+            if QtCore.QSettings().value(u'advanced/enable exit confirmation',
+                QtCore.QVariant(True)).toBool():
+                ret = QtGui.QMessageBox.question(self,
+                    translate('OpenLP.MainWindow', 'Close OpenLP'),
+                    translate('OpenLP.MainWindow', 'Are you sure you want to close OpenLP?'),
+                    QtGui.QMessageBox.StandardButtons(
+                        QtGui.QMessageBox.Yes |
+                        QtGui.QMessageBox.No),
+                    QtGui.QMessageBox.Yes)
+                if ret == QtGui.QMessageBox.Yes:
+                    self.cleanUp()
+                    event.accept()
+                else:
+                    event.ignore()
+            else:
                 self.cleanUp()
                 event.accept()
-            else:
-                event.ignore()
+
 
     def cleanUp(self):
         """
@@ -1054,4 +1059,4 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
             self.recentFiles.insert(0, QtCore.QString(filename))
             while self.recentFiles.count() > maxRecentFiles:
                 # Don't care what API says takeLast works, removeLast doesn't!
-                self.recentFiles.takeLast()
+                self.recentFiles.takeLast()
\ No newline at end of file