diff --git a/src/libaudqt/song-window-qt.cc b/src/libaudqt/song-window-qt.cc
index 4b4bc1efd..31c0aa4a4 100644
--- a/src/libaudqt/song-window-qt.cc
+++ b/src/libaudqt/song-window-qt.cc
@@ -27,6 +27,7 @@
 #include <QFrame>
 #include <QHeaderView>
 #include <QItemSelectionModel>
+#include <QKeyEvent>
 #include <QLabel>
 #include <QLineEdit>
 #include <QPushButton>
@@ -245,6 +246,9 @@ class SongsWindow : public QDialog
             delete instance;
     }
 
+protected:
+    void keyPressEvent(QKeyEvent * event) override;
+
 private:
     static SongsWindow * instance;
     SongListModel m_songListModel;
@@ -378,6 +382,17 @@ SongsWindow::SongsWindow()
     resize(500, 500);
 }
 
+void SongsWindow::keyPressEvent(QKeyEvent * event)
+{
+    if (event->key() == Qt::Key_Return && event->modifiers() == Qt::ShiftModifier)
+    {
+        // Let Shift+Enter act as another shortcut for the Queue button
+        this->m_queueAndUnqueueButton.animateClick();
+    }
+
+    QDialog::keyPressEvent(event);
+}
+
 EXPORT void songwin_show()
 {
     window_bring_to_front(SongsWindow::get_instance());