diff --git a/channels/paramount.py b/channels/paramount.py
index 0e4c8684..6a91cf5d 100644
--- a/channels/paramount.py
+++ b/channels/paramount.py
@@ -171,6 +171,6 @@ def findvideos(item):
     for quality, url in video_urls:
         if quality not in qualities:
             qualities.append(quality)
-            itemlist.append(item.clone(title=support.config.get_localized_string(30137), server='directo', action='play', url=url, quality=quality))
+            itemlist.append(item.clone(title=support.config.get_localized_string(30137), server='directo', action='play', url=url, quality=quality, focusOnVideoPlayer=True))
     itemlist.sort(key=lambda item: item.quality)
     return support.server(item, itemlist=itemlist, Download=False)
diff --git a/platformcode/launcher.py b/platformcode/launcher.py
index 8bfcc231..9eb64d2c 100644
--- a/platformcode/launcher.py
+++ b/platformcode/launcher.py
@@ -125,6 +125,10 @@ def run(item=None):
             from platformcode import infoplus
             return infoplus.Main(item)
 
+        elif item.channel == "backup":
+            from platformcode import backup
+            return getattr(backup, item.action)(item)
+
         elif item.channel == "shortcuts":
             from platformcode import shortcuts
             return getattr(shortcuts, item.action)(item)
diff --git a/platformcode/platformtools.py b/platformcode/platformtools.py
index 698aca0a..a1a9ac23 100644
--- a/platformcode/platformtools.py
+++ b/platformcode/platformtools.py
@@ -945,15 +945,11 @@ def set_player(item, xlistitem, mediaurl, view, strm, nfo_path=None, head_nfo=No
         from platformcode import xbmc_videolibrary
         xbmc_videolibrary.mark_auto_as_watched(item, nfo_path, head_nfo, item_nfo)
 
-    if 'paramount' in item.title.lower():
-        # from core.support import dbg;dbg()
-        from time import time, sleep
-        start_time = time()
-        while not is_playing() or (time() - start_time) > 5:
-            continue
+    # for cases where the audio playback window appears in place of the video one
+    if item.focusOnVideoPlayer:
         while is_playing and xbmcgui.getCurrentWindowId() != 12006:
             continue
-        xbmcgui.Window(12006).show()
+        xbmc.sleep(500)
         xbmcgui.Window(12005).show()
 
 
diff --git a/platformcode/xbmc_videolibrary.py b/platformcode/xbmc_videolibrary.py
index fb6ea365..ea0c7745 100644
--- a/platformcode/xbmc_videolibrary.py
+++ b/platformcode/xbmc_videolibrary.py
@@ -44,7 +44,7 @@ def mark_auto_as_watched(item, nfo_path=None, head_nfo=None, item_nfo=None):
         while platformtools.is_playing():
             actual_time = xbmc.Player().getTime()
             total_time = xbmc.Player().getTotalTime()
-            if item_nfo.played_time and item_nfo.played_time > actual_time > 1:
+            if item_nfo.played_time and xbmcgui.getCurrentWindowId() == 12005:
                 xbmc.Player().seekTime(item_nfo.played_time)
                 item_nfo.played_time = 0 # Fix for Slow Devices