diff --git a/src/covermanager/albumcovermanager.cpp b/src/covermanager/albumcovermanager.cpp
index fa778fc30..1799c303f 100644
--- a/src/covermanager/albumcovermanager.cpp
+++ b/src/covermanager/albumcovermanager.cpp
@@ -621,6 +621,7 @@ void AlbumCoverManager::ShowCover() {
   if (!song.is_valid()) return;
 
   album_cover_choice_controller_->ShowCover(song);
+
 }
 
 void AlbumCoverManager::FetchSingleCover() {
@@ -809,13 +810,11 @@ SongMimeData *AlbumCoverManager::GetMimeDataForAlbums(const QModelIndexList &ind
 
 }
 
-void AlbumCoverManager::AlbumDoubleClicked(const QModelIndex &index) {
+void AlbumCoverManager::AlbumDoubleClicked(const QModelIndex &idx) {
 
-  SongMimeData *mimedata = GetMimeDataForAlbums(QModelIndexList() << index);
-  if (mimedata) {
-    mimedata->from_doubleclick_ = true;
-    emit AddToPlaylist(mimedata);
-  }
+  QListWidgetItem *item = static_cast<QListWidgetItem*>(idx.internalPointer());
+  if (!item) return;
+  album_cover_choice_controller_->ShowCover(ItemAsSong(item));
 
 }
 
diff --git a/src/covermanager/albumcovermanager.h b/src/covermanager/albumcovermanager.h
index ac63a3c1e..cce6457df 100644
--- a/src/covermanager/albumcovermanager.h
+++ b/src/covermanager/albumcovermanager.h
@@ -151,7 +151,7 @@ class AlbumCoverManager : public QMainWindow {
   void ShowCover();
 
   // For adding albums to the playlist
-  void AlbumDoubleClicked(const QModelIndex &index);
+  void AlbumDoubleClicked(const QModelIndex &idx);
   void AddSelectedToPlaylist();
   void LoadSelectedToPlaylist();