diff --git a/frontend/src/routes.js b/frontend/src/routes.js
index 873eedec7..4a4f8dc86 100644
--- a/frontend/src/routes.js
+++ b/frontend/src/routes.js
@@ -132,7 +132,7 @@ export default [
     path: "/albums",
     component: Albums,
     meta: { title: $gettext("Albums"), auth: true },
-    props: { view: "album", staticFilter: { type: "album", order: "relevance" } },
+    props: { view: "album", staticFilter: { type: "album", order: "name" } },
   },
   {
     name: "album",
diff --git a/internal/search/albums.go b/internal/search/albums.go
index 9619c625e..4383aea53 100644
--- a/internal/search/albums.go
+++ b/internal/search/albums.go
@@ -77,16 +77,16 @@ func Albums(f form.SearchAlbums) (results AlbumResults, err error) {
 		s = s.Order("albums.album_favorite DESC, has_year, albums.album_year DESC, albums.album_month DESC, albums.album_title ASC, albums.album_uid DESC")
 	case entity.SortOrderPlace:
 		s = s.Order("albums.album_favorite DESC, albums.album_location, albums.album_title, albums.album_year DESC, albums.album_month ASC, albums.album_day ASC, albums.album_uid DESC")
-	case entity.SortOrderName:
-		s = s.Order("albums.album_title ASC, albums.album_uid DESC")
 	case entity.SortOrderPath:
 		s = s.Order("albums.album_path, albums.album_uid DESC")
 	case entity.SortOrderCategory:
 		s = s.Order("albums.album_category, albums.album_title, albums.album_uid DESC")
 	case entity.SortOrderSlug:
 		s = s.Order("albums.album_favorite DESC, albums.album_slug ASC, albums.album_uid DESC")
+	case entity.SortOrderName:
+		s = s.Order("albums.album_favorite DESC, albums.album_title ASC, albums.album_uid DESC")
 	default:
-		s = s.Order("albums.album_favorite DESC, has_year, albums.album_title ASC, albums.album_uid DESC")
+		s = s.Order("albums.album_favorite DESC, albums.album_title ASC, albums.album_uid DESC")
 	}
 
 	if f.ID != "" {