diff --git a/source/Main.bs b/source/Main.bs
index 2ef81455d..f2a32c6aa 100644
--- a/source/Main.bs
+++ b/source/Main.bs
@@ -388,9 +388,9 @@ sub Main (args as dynamic) as void
             selectedIndex = msg.getData()
             screenContent = msg.getRoSGNode()
 
-            m.global.queueManager.callFunc("clear")
             m.global.queueManager.callFunc("resetShuffle")
-            m.global.queueManager.callFunc("push", screenContent.albumData.items[selectedIndex])
+            m.global.queueManager.callFunc("set", screenContent.albumData.items)
+            m.global.queueManager.callFunc("setPosition", selectedIndex)
             m.global.queueManager.callFunc("playQueue")
         else if isNodeEvent(msg, "playItem")
             ' User has selected audio they want us to play