diff --git a/openlp/core/lib/rendermanager.py b/openlp/core/lib/rendermanager.py
index 0c9549ea5..4f84cf27e 100644
--- a/openlp/core/lib/rendermanager.py
+++ b/openlp/core/lib/rendermanager.py
@@ -145,7 +145,8 @@ class RenderManager(object):
             else:
                 self.theme = self.service_theme
         else:
-            if theme:
+            # Images have a theme of -1
+            if theme and theme != -1:
                 self.theme = theme
             elif theme_level == ThemeLevel.Song or \
                 theme_level == ThemeLevel.Service:
diff --git a/openlp/core/ui/slidecontroller.py b/openlp/core/ui/slidecontroller.py
index 2f0e789a5..7cb1eb5c4 100644
--- a/openlp/core/ui/slidecontroller.py
+++ b/openlp/core/ui/slidecontroller.py
@@ -944,6 +944,7 @@ class SlideController(QtGui.QWidget):
             self.onSlideSelected()
 
     def __checkUpdateSelectedSlide(self, row):
+        print row, self.previewListWidget.rowCount()
         if row + 1 < self.previewListWidget.rowCount():
             self.previewListWidget.scrollToItem(
                 self.previewListWidget.item(row + 1, 0))