diff --git a/src/qml/EntryPage.qml b/src/qml/EntryPage.qml
index 0085ef33..b377c821 100644
--- a/src/qml/EntryPage.qml
+++ b/src/qml/EntryPage.qml
@@ -99,13 +99,13 @@ Kirigami.ScrollablePage {
     actions.left: Kirigami.Action {
         text: !entry.queueStatus ? i18n("Add to queue") : i18n("Remove from Queue")
         icon.name: !entry.queueStatus ? "media-playlist-append" : "list-remove"
-        visible: entry.enclosure
+        visible: entry.enclosure || entry.queueStatus
         onTriggered: {
             if(!entry.queueStatus) {
                 entry.queueStatus = true
             } else {
                 // first change to next track if this one is playing
-                if (entry === audio.entry) {
+                if (entry.hasEnclosure && entry === audio.entry) {
                     audio.next()
                 }
                 entry.queueStatus = false
diff --git a/src/qml/GenericEntryDelegate.qml b/src/qml/GenericEntryDelegate.qml
index 1e32d6a4..04dec770 100644
--- a/src/qml/GenericEntryDelegate.qml
+++ b/src/qml/GenericEntryDelegate.qml
@@ -162,6 +162,14 @@ Kirigami.SwipeListItem {
     }
 
     actions: [
+        Kirigami.Action {
+            text: i18n("Remove from Queue")
+            icon.name: "list-remove"
+            onTriggered: {
+                entry.queueStatus = false;
+            }
+            visible: !entry.enclosure && entry.queueStatus
+        },
         Kirigami.Action {
             text: i18n("Download")
             icon.name: "download"