diff --git a/src/collection/collectionfilterwidget.cpp b/src/collection/collectionfilterwidget.cpp
index be32fb0ce..f5b1f647c 100644
--- a/src/collection/collectionfilterwidget.cpp
+++ b/src/collection/collectionfilterwidget.cpp
@@ -290,7 +290,7 @@ void CollectionFilterWidget::SetCollectionModel(CollectionModel *model) {
     s.beginGroup(settings_group_);
     model_->SetGroupBy(CollectionModel::Grouping(
         CollectionModel::GroupBy(s.value(group_by(1), int(CollectionModel::GroupBy_AlbumArtist)).toInt()),
-        CollectionModel::GroupBy(s.value(group_by(2), int(CollectionModel::GroupBy_Album)).toInt()),
+        CollectionModel::GroupBy(s.value(group_by(2), int(CollectionModel::GroupBy_AlbumDisc)).toInt()),
         CollectionModel::GroupBy(s.value(group_by(3), int(CollectionModel::GroupBy_None)).toInt())));
   }
 
diff --git a/src/collection/collectionmodel.cpp b/src/collection/collectionmodel.cpp
index 2a9d2b13b..7ab572df4 100644
--- a/src/collection/collectionmodel.cpp
+++ b/src/collection/collectionmodel.cpp
@@ -107,7 +107,7 @@ CollectionModel::CollectionModel(CollectionBackend *backend, Application *app, Q
   root_->lazy_loaded = true;
 
   group_by_[0] = GroupBy_AlbumArtist;
-  group_by_[1] = GroupBy_Album;
+  group_by_[1] = GroupBy_AlbumDisc;
   group_by_[2] = GroupBy_None;
 
   cover_loader_options_.desired_height_ = kPrettyCoverSize;
diff --git a/src/internet/internetsearchmodel.cpp b/src/internet/internetsearchmodel.cpp
index c4a418175..c21f6ecba 100644
--- a/src/internet/internetsearchmodel.cpp
+++ b/src/internet/internetsearchmodel.cpp
@@ -48,7 +48,7 @@ InternetSearchModel::InternetSearchModel(InternetService *service, QObject *pare
       {
 
   group_by_[0] = CollectionModel::GroupBy_AlbumArtist;
-  group_by_[1] = CollectionModel::GroupBy_Album;
+  group_by_[1] = CollectionModel::GroupBy_AlbumDisc;
   group_by_[2] = CollectionModel::GroupBy_None;
 
   no_cover_icon_ = album_icon_.pixmap(album_icon_.availableSizes().last()).scaled(CollectionModel::kPrettyCoverSize, CollectionModel::kPrettyCoverSize, Qt::KeepAspectRatio, Qt::SmoothTransformation);
diff --git a/src/internet/internetsearchview.cpp b/src/internet/internetsearchview.cpp
index 3bdf19ba4..22a4c7d1c 100644
--- a/src/internet/internetsearchview.cpp
+++ b/src/internet/internetsearchview.cpp
@@ -241,7 +241,7 @@ void InternetSearchView::ReloadSettings() {
 
   SetGroupBy(CollectionModel::Grouping(
       CollectionModel::GroupBy(s.value("search_group_by1", int(CollectionModel::GroupBy_AlbumArtist)).toInt()),
-      CollectionModel::GroupBy(s.value("search_group_by2", int(CollectionModel::GroupBy_Album)).toInt()),
+      CollectionModel::GroupBy(s.value("search_group_by2", int(CollectionModel::GroupBy_AlbumDisc)).toInt()),
       CollectionModel::GroupBy(s.value("search_group_by3", int(CollectionModel::GroupBy_None)).toInt())));
   s.endGroup();