diff --git a/openlp/core/ui/mainwindow.py b/openlp/core/ui/mainwindow.py
index 02f3e0e5b..a3ec3d4a6 100644
--- a/openlp/core/ui/mainwindow.py
+++ b/openlp/core/ui/mainwindow.py
@@ -693,6 +693,7 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
         """
         QtGui.QWidget.show(self)
         self.LiveController.display.setup()
+        self.PreviewController.display.setup()
         if self.LiveController.display.isVisible():
             self.LiveController.display.setFocus()
         self.activateWindow()
diff --git a/openlp/core/ui/slidecontroller.py b/openlp/core/ui/slidecontroller.py
index f23e8c20c..bc0efeaa7 100644
--- a/openlp/core/ui/slidecontroller.py
+++ b/openlp/core/ui/slidecontroller.py
@@ -574,7 +574,7 @@ class SlideController(QtGui.QWidget):
                         self.slideList[tag1] = framenumber
                         self.SongMenu.menu().addAction(tag1,
                             self.onSongBarHandler)
-                item.setText(frame[u'text'])
+                item.setText(self.clean(frame[u'text']))
             else:
                 label = QtGui.QLabel()
                 label.setMargin(4)
@@ -981,3 +981,9 @@ class SlideController(QtGui.QWidget):
             self.video.hide()
         self.SlidePreview.clear()
         self.SlidePreview.show()
+
+    def clean(self, text):
+        text = text.replace(u'<br>', u'\n').replace(u'<p>', u'')\
+            .replace(u'</p>', u'').replace(u'<sup>', u'')\
+            .replace(u'</sup>', u'')
+        return text