diff --git a/src/collection/collectionview.cpp b/src/collection/collectionview.cpp
index 5fd72e0d5..34a955ac3 100644
--- a/src/collection/collectionview.cpp
+++ b/src/collection/collectionview.cpp
@@ -343,6 +343,22 @@ void CollectionView::mouseReleaseEvent(QMouseEvent *e) {
 
 }
 
+void CollectionView::keyPressEvent(QKeyEvent *e) {
+
+  switch (e->key()) {
+    case Qt::Key_Enter:
+    case Qt::Key_Return:
+      if (currentIndex().isValid()) {
+        AddToPlaylist();
+      }
+      e->accept();
+      break;
+  }
+
+  AutoExpandingTreeView::keyPressEvent(e);
+
+}
+
 void CollectionView::contextMenuEvent(QContextMenuEvent *e) {
 
   if (!context_menu_) {
diff --git a/src/collection/collectionview.h b/src/collection/collectionview.h
index e2c716eec..60d6193a0 100644
--- a/src/collection/collectionview.h
+++ b/src/collection/collectionview.h
@@ -93,6 +93,7 @@ class CollectionView : public AutoExpandingTreeView {
  protected:
   // QWidget
   void paintEvent(QPaintEvent *event) override;
+  void keyPressEvent(QKeyEvent *e) override;
   void mouseReleaseEvent(QMouseEvent *e) override;
   void contextMenuEvent(QContextMenuEvent *e) override;