diff --git a/components/photos/PhotoDetails.bs b/components/photos/PhotoDetails.bs
index 53bb5cd99..e9465069e 100644
--- a/components/photos/PhotoDetails.bs
+++ b/components/photos/PhotoDetails.bs
@@ -93,6 +93,13 @@ sub statusUpdate()
     m.hideStatusAnimation.control = "start"
 end sub
 
+' JFScreen hook.
+' Used to ensure tasks are stopped
+sub OnScreenHidden()
+    m.slideshowTimer.control = "stop"
+    m.statusTimer.control = "stop"
+end sub
+
 function onKeyEvent(key as string, press as boolean) as boolean
     if not press then return false
 
diff --git a/components/photos/PhotoDetails.xml b/components/photos/PhotoDetails.xml
index 4afe4a0a2..508c5771b 100644
--- a/components/photos/PhotoDetails.xml
+++ b/components/photos/PhotoDetails.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component name="PhotoDetails" extends="JFGroup">
+<component name="PhotoDetails" extends="JFScreen">
   <children>
     <Poster id="photo" width="1920" height="1080" loadDisplayMode="scaleToFit" />
     <Rectangle id="background" color="0x101010EE" height="120" width="500" Translation="[700, -150]" opacity="0">