diff --git a/openlp/core/lib/rendermanager.py b/openlp/core/lib/rendermanager.py
index b9de5365d..ead9971e2 100644
--- a/openlp/core/lib/rendermanager.py
+++ b/openlp/core/lib/rendermanager.py
@@ -146,7 +146,10 @@ class RenderManager(object):
         if self.theme != self.renderer.theme_name or self.themedata is None \
             or overrideLevels:
             log.debug(u'theme is now %s', self.theme)
-            self.themedata = self.theme_manager.getThemeData(self.theme)
+            if overrideLevels:
+                self.themedata = theme
+            else:
+                self.themedata = self.theme_manager.getThemeData(self.theme)
             self.calculate_default(self.screens.current[u'size'])
             self.renderer.set_theme(self.themedata)
             self.build_text_rectangle(self.themedata)
@@ -198,6 +201,8 @@ class RenderManager(object):
         footer.append(u'Amazing Grace (John Newton)' )
         footer.append(u'Public Domain')
         footer.append(u'CCLI 123456')
+        # Previews do not need the transition switched on!
+        themedata.display_slideTransition = False
         # build a service item to generate preview
         serviceItem = ServiceItem()
         serviceItem.theme = themedata
diff --git a/openlp/core/lib/serviceitem.py b/openlp/core/lib/serviceitem.py
index 90a51a8d4..2f4c40414 100644
--- a/openlp/core/lib/serviceitem.py
+++ b/openlp/core/lib/serviceitem.py
@@ -147,7 +147,7 @@ class ServiceItem(object):
         if self.service_item_type == ServiceItemType.Text:
             log.debug(u'Formatting slides')
             theme = None
-            if not self.theme:
+            if self.theme:
                 theme = self.theme
             self.main, self.footer = \
                 self.render_manager.set_override_theme(theme, useOverride)
diff --git a/openlp/core/ui/maindisplay.py b/openlp/core/ui/maindisplay.py
index e078ad271..9ab9c9cdb 100644
--- a/openlp/core/ui/maindisplay.py
+++ b/openlp/core/ui/maindisplay.py
@@ -279,8 +279,9 @@ class MainDisplay(DisplayWidget):
         log.debug(u'preview')
         # Wait for the fade to finish before geting the preview.
         # Important otherwise preview will have incorrect text if at all !
-        while self.frame.evaluateJavaScript("fadeFinished()").toString() == u'false':
-            Receiver.send_message(u'openlp_process_events')
+        if self.serviceItem.themedata.display_slideTransition:
+            while self.frame.evaluateJavaScript("fadeFinished()").toString() == u'false':
+                Receiver.send_message(u'openlp_process_events')
         # Wait for the webview to update before geting the preview.
         # Important otherwise first preview will miss the background !
         while not self.loaded: