diff --git a/Persephone/Controllers/QueueViewController.swift b/Persephone/Controllers/QueueViewController.swift
index 3a9e4cf..bf26dfd 100644
--- a/Persephone/Controllers/QueueViewController.swift
+++ b/Persephone/Controllers/QueueViewController.swift
@@ -33,8 +33,10 @@ class QueueViewController: NSViewController,
   }
 
   @IBAction func playTrack(_ sender: Any) {
-    if dataSource.queuePos >= 0 {
-      AppDelegate.mpdClient.playTrack(queuePos: dataSource.queuePos)
+    let newQueuePos = queueView.selectedRow - 1
+
+    if newQueuePos >= 0 {
+      AppDelegate.mpdClient.playTrack(queuePos: newQueuePos)
     }
   }