diff --git a/src/globalsearch/globalsearchmodel.cpp b/src/globalsearch/globalsearchmodel.cpp
index 0358a4500..b84fd6233 100644
--- a/src/globalsearch/globalsearchmodel.cpp
+++ b/src/globalsearch/globalsearchmodel.cpp
@@ -29,7 +29,7 @@ GlobalSearchModel::GlobalSearchModel(GlobalSearch* engine, QObject* parent)
       use_pretty_covers_(true),
       artist_icon_(IconLoader::Load("x-clementine-artist", IconLoader::Base)),
       album_icon_(IconLoader::Load("x-clementine-album", IconLoader::Base)) {
-  group_by_[0] = LibraryModel::GroupBy_Artist;
+  group_by_[0] = LibraryModel::GroupBy_AlbumArtist;
   group_by_[1] = LibraryModel::GroupBy_Album;
   group_by_[2] = LibraryModel::GroupBy_None;
 
diff --git a/src/library/librarymodel.cpp b/src/library/librarymodel.cpp
index 3a803218c..fa32be373 100644
--- a/src/library/librarymodel.cpp
+++ b/src/library/librarymodel.cpp
@@ -93,7 +93,7 @@ LibraryModel::LibraryModel(LibraryBackend* backend, Application* app,
       show_dividers_(true) {
   root_->lazy_loaded = true;
 
-  group_by_[0] = GroupBy_Artist;
+  group_by_[0] = GroupBy_AlbumArtist;
   group_by_[1] = GroupBy_Album;
   group_by_[2] = GroupBy_None;