diff --git a/src/qml/presenter/MainWindow.qml b/src/qml/presenter/MainWindow.qml
index 40e9e1d..c51a5b2 100644
--- a/src/qml/presenter/MainWindow.qml
+++ b/src/qml/presenter/MainWindow.qml
@@ -131,7 +131,9 @@ Controls.Page {
         SlideObject.changeSlide(item);
         
         if (item.backgroundType === "video")
+        {
             presentation.loadVideo();
+        }
 
         presentation.textIndex = 0;
         presentation.changeSlide();
diff --git a/src/qml/presenter/PresentationWindow.qml b/src/qml/presenter/PresentationWindow.qml
index f7dadc7..5e70935 100644
--- a/src/qml/presenter/PresentationWindow.qml
+++ b/src/qml/presenter/PresentationWindow.qml
@@ -34,7 +34,7 @@ Window {
         id: presentationSlide
         anchors.fill: parent
         imageSource: SlideObject.imageBackground
-        videoSource: SlideObject.videoBackground
+        videoSource: presentationWindow.visible ? SlideObject.videoBackground : null
         text: SlideObject.text
     }