diff --git a/platformcode/launcher.py b/platformcode/launcher.py
index 7c0f11ca..49a0ec67 100644
--- a/platformcode/launcher.py
+++ b/platformcode/launcher.py
@@ -473,6 +473,7 @@ def play_from_library(item):
     # and launch kodi again
     if xbmc.getCondVisibility('Window.IsMedia') and not window_type == 1:
         # Conventional window
+        item.window = True
         xbmc.executebuiltin("Container.Update(" + sys.argv[0] + "?" + item.tourl() + ")")
 
     else:
diff --git a/platformcode/platformtools.py b/platformcode/platformtools.py
index 74c33340..81e9b0de 100644
--- a/platformcode/platformtools.py
+++ b/platformcode/platformtools.py
@@ -1036,7 +1036,7 @@ def set_player(item, xlistitem, mediaurl, view, strm):
         logger.info("mediaurl=" + mediaurl)
 
         if player_mode in [0,1]:
-            prevent_busy(item)
+            if player_mode in [1]: prevent_busy(item)
             logger.info('Player Mode:' + ['Direct', 'Bookmark'][player_mode])
             # Add the listitem to a playlist
             playlist = xbmc.PlayList(xbmc.PLAYLIST_VIDEO)