diff --git a/openlp/core/ui/maindisplay.py b/openlp/core/ui/maindisplay.py
index 4f46ccbe4..1ba31ea62 100644
--- a/openlp/core/ui/maindisplay.py
+++ b/openlp/core/ui/maindisplay.py
@@ -143,11 +143,7 @@ class MainDisplay(DisplayWidget):
         self.screen = self.screens.current
         #Sort out screen locations and sizes
         self.setGeometry(self.screen[u'size'])
-        self.alertScreenPosition = self.screen[u'size'].height() * 0.9
-        self.alertHeight = self.screen[u'size'].height() - self.alertScreenPosition
-        self.display_alert.setGeometry(
-            QtCore.QRect(0, self.alertScreenPosition,
-                        self.screen[u'size'].width(),self.alertHeight))
+        self.display_alert.setGeometry(self.screen[u'size'])
         self.video.setGeometry(self.screen[u'size'])
         self.display_image.resize(self.screen[u'size'].width(),
                             self.screen[u'size'].height())
diff --git a/openlp/plugins/alerts/forms/alertstab.py b/openlp/plugins/alerts/forms/alertstab.py
index 2bb9beed3..a6653d152 100644
--- a/openlp/plugins/alerts/forms/alertstab.py
+++ b/openlp/plugins/alerts/forms/alertstab.py
@@ -176,6 +176,8 @@ class AlertsTab(SettingsTab):
             QtCore.SIGNAL(u'pressed()'), self.onFontColorButtonClicked)
         QtCore.QObject.connect(self.FontComboBox,
             QtCore.SIGNAL(u'activated(int)'), self.onFontComboBoxClicked)
+        QtCore.QObject.connect(self.LocationComboBox,
+            QtCore.SIGNAL(u'activated(int)'), self.onLocationComboBoxClicked)
         QtCore.QObject.connect(self.TimeoutSpinBox,
             QtCore.SIGNAL(u'valueChanged(int)'), self.onTimeoutSpinBoxChanged)
         QtCore.QObject.connect(self.FontSizeSpinBox,
@@ -206,6 +208,9 @@ class AlertsTab(SettingsTab):
     def onFontComboBoxClicked(self):
         self.updateDisplay()
 
+    def onLocationComboBoxClicked(self, location):
+        self.location = location
+
     def onFontColorButtonClicked(self):
         self.font_color = QtGui.QColorDialog.getColor(
             QtGui.QColor(self.font_color), self).name()