diff --git a/src/branding/default/show.qml b/src/branding/default/show.qml
index c989676dd..1a174f0b6 100644
--- a/src/branding/default/show.qml
+++ b/src/branding/default/show.qml
@@ -25,7 +25,7 @@ Presentation
     id: presentation
 
     function nextSlide() {
-        console.log("Next slide");
+        console.log("QML Component (default slideshow) Next slide");
         presentation.goToNextSlide();
     }
 
@@ -70,7 +70,13 @@ Presentation
 
     function onActivate() {
         presentation.currentSlide = 0;
-        advanceTimer.running = true
+        presentation.activatedInCalamares = true;
+        advanceTimer.running = true;
         console.log("QML Component (default slideshow) activated");
     }
+    
+    function onLeave() {
+        presentation.activatedInCalamares = true;
+    }
+
 }
diff --git a/src/qml/calamares/slideshow/Presentation.qml b/src/qml/calamares/slideshow/Presentation.qml
index 7053fb0ae..a4138d588 100644
--- a/src/qml/calamares/slideshow/Presentation.qml
+++ b/src/qml/calamares/slideshow/Presentation.qml
@@ -8,6 +8,9 @@
  *       (this and the 'c' key make sense in a *presentation*
  *       slideshow, not in a passive slideshow like Calamares)
  *     - remove quit key
+ *   Copyright 2019, Adriaan de Groot <groot@kde.org>
+ *     - Support "V2" loading
+ *     - Disable shortcuts until the content is visible in Calamares
  *
  *   SPDX-License-Identifier: LGPL-2.1
  *   License-Filename: LICENSES/LGPLv2.1-Presentation