1 files changed, 7 insertions, 2 deletions

diff --git a/ui.js b/ui.js
index 4228650..4b64017 100644
--- a/ui.js
+++ b/ui.js
@@ -107,6 +107,7 @@ class AppElement extends FocusElement {
       () => handleSelectFromMain(item)))
     grouplikeListing.on('queue', item => this.queueGrouplikeItem(item))
     grouplikeListing.on('queue (shuffled)', item => this.shuffleQueueGrouplikeItem(item))
+    grouplikeListing.on('queue (play next)', item => this.queueGrouplikeItem(item, true, this.playingTrack))
 
     const handleSelectFromPathElement = item => {
       this.form.selectInput(grouplikeListing)
@@ -633,7 +634,7 @@ class GrouplikeListingElement extends FocusElement {
     if (this.grouplike.items.length) {
       for (const item of this.grouplike.items) {
         const itemElement = new GrouplikeItemElement(item, this.recordStore)
-        for (const evtName of ['download', 'remove', 'select (space)', 'select (enter)', 'queue', 'queue (shuffled)']) {
+        for (const evtName of ['download', 'remove', 'select (space)', 'select (enter)', 'queue', 'queue (shuffled)', 'queue (play next)']) {
           itemElement.on(evtName, () => this.emit(evtName, item))
         }
         form.addInput(itemElement)
@@ -788,7 +789,11 @@ class GrouplikeItemElement extends Button {
       if (keyBuf[0] === 'q'.charCodeAt(0)) {
         this.emit('queue')
       } else {
-        this.emit('queue (shuffled)')
+        if (isGroup(this.item)) {
+          this.emit('queue (shuffled)')
+        } else {
+          this.emit('queue (play next)')
+        }
       }
     } else if (telc.isBackspace(keyBuf)) {
       this.emit('remove')