diff --git a/openlp/core/lib/toolbar.py b/openlp/core/lib/toolbar.py
index 81ee3e667..b0473b767 100644
--- a/openlp/core/lib/toolbar.py
+++ b/openlp/core/lib/toolbar.py
@@ -136,4 +136,4 @@ class OpenLPToolbar(QtGui.QToolBar):
         pushButton.setCheckable(True)
         pushButton.setFlat(True)
         self.addWidget(pushButton)
-        return pushButton
\ No newline at end of file
+        return pushButton
diff --git a/openlp/core/ui/generaltab.py b/openlp/core/ui/generaltab.py
index 46941b6fa..0c3af4c5d 100644
--- a/openlp/core/ui/generaltab.py
+++ b/openlp/core/ui/generaltab.py
@@ -173,7 +173,7 @@ class GeneralTab(SettingsTab):
             self.MonitorComboBox.addItem(screen_name)
         # Get the configs
         self.MonitorNumber = int(self.config.get_config(u'Monitor', u'0'))
-        self.Warning = str_to_bool(self.config.get_config(u'Warning', u'False'))
+        self.Warning = str_to_bool(self.config.get_config(u'Blank Warning', u'False'))
         self.AutoOpen = str_to_bool(self.config.get_config(u'Auto Open', u'False'))
         self.ShowSplash = str_to_bool(self.config.get_config(u'show splash', u'True'))
         self.CCLNumber = unicode(self.config.get_config(u'CCL Number', u'XXX'))
@@ -190,7 +190,7 @@ class GeneralTab(SettingsTab):
 
     def save(self):
         self.config.set_config(u'Monitor', self.MonitorNumber)
-        self.config.set_config(u'Warning', self.Warning)
+        self.config.set_config(u'Blank Warning', self.Warning)
         self.config.set_config(u'Auto Open', self.AutoOpen)
         self.config.set_config(u'show splash', self.ShowSplash)
         self.config.set_config(u'CCL Number', self.CCLNumber)
diff --git a/openlp/core/ui/maindisplay.py b/openlp/core/ui/maindisplay.py
index e98d1eb96..6f3bf910d 100644
--- a/openlp/core/ui/maindisplay.py
+++ b/openlp/core/ui/maindisplay.py
@@ -182,6 +182,7 @@ class MainDisplay(DisplayLabel):
             self.displayBlank = False
             if self.frame is not None:
                 self.frameView(self.frame)
+        self.parent.generalConfig.set_config(u'Screen Blank',self.displayBlank)
 
     def displayAlert(self, text=u''):
         """
diff --git a/openlp/core/ui/mainwindow.py b/openlp/core/ui/mainwindow.py
index 78d673db0..eb7c00fe4 100644
--- a/openlp/core/ui/mainwindow.py
+++ b/openlp/core/ui/mainwindow.py
@@ -581,6 +581,9 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
         self.versionCheck()
         if str_to_bool(self.generalConfig.get_config(u'Auto Open', False)):
             self.ServiceManagerContents.onLoadService(True)
+        if str_to_bool(self.generalConfig.get_config(u'Screen Blank', False)) \
+        and str_to_bool(self.generalConfig.get_config(u'Blank Warning', False)):
+            print "Popup goes here"
 
     def onHelpAboutItemClicked(self):
         """