diff --git a/openlp/core/ui/mainwindow.py b/openlp/core/ui/mainwindow.py
index 7fbe4c55a..b88f69910 100644
--- a/openlp/core/ui/mainwindow.py
+++ b/openlp/core/ui/mainwindow.py
@@ -827,12 +827,12 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
         else:
             ret = QtGui.QMessageBox.question(self,
                 translate('OpenLP.MainWindow', 'Close OpenLP'),
-                translate('OpenLP.MainWindow', 'Are you sure you want to Exit.'),
+                translate('OpenLP.MainWindow', 'Are you sure you want to Exit?'),
                 QtGui.QMessageBox.StandardButtons(
-                    QtGui.QMessageBox.Cancel |
-                    QtGui.QMessageBox.Ok),
-                QtGui.QMessageBox.Ok)
-            if ret == QtGui.QMessageBox.Ok:
+                    QtGui.QMessageBox.Yes |
+                    QtGui.QMessageBox.No),
+                QtGui.QMessageBox.Yes)
+            if ret == QtGui.QMessageBox.Yes:
                 self.cleanUp()
                 event.accept()
             else: