diff --git a/src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs b/src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs
index 1b7850b..f1051db 100644
--- a/src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs
+++ b/src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs
@@ -337,7 +337,7 @@ namespace Banshee.Query
             PlayCountField.ShortLabel   = Catalog.GetString ("Plays");
         }
 
-        private const string default_sort = @"CoreAlbums.ArtistNameLowered ASC, CoreAlbums.TitleLowered ASC, CoreTracks.Disc ASC, CoreTracks.TrackNumber ASC";
+        private const string default_sort = @"CoreAlbums.ArtistNameLowered ASC, CoreTracks.Year ASC, CoreAlbums.TitleLowered ASC, CoreTracks.Disc ASC, CoreTracks.TrackNumber ASC";
         public static string GetSort (string key)
         {
             return GetSort (key, false);
@@ -354,6 +354,7 @@ namespace Banshee.Query
                 case "grouping":
                     sort_query = String.Format (@"
                         CoreAlbums.ArtistNameLowered ASC, 
+                        CoreTracks.Year ASC,
                         CoreAlbums.TitleLowered ASC, 
                         CoreTracks.Disc ASC,
                         CoreTracks.TrackNumber {0}", ascDesc); 
@@ -362,6 +363,7 @@ namespace Banshee.Query
                 case "albumartist":
                     sort_query = String.Format (@"
                         CoreAlbums.ArtistNameLowered {0}, 
+                        CoreTracks.Year ASC,
                         CoreAlbums.TitleLowered ASC, 
                         CoreTracks.Disc ASC,
                         CoreTracks.TrackNumber ASC", ascDesc); 
@@ -370,6 +372,7 @@ namespace Banshee.Query
                 case "artist":
                     sort_query = String.Format (@"
                         CoreArtists.NameLowered {0}, 
+                        CoreTracks.Year ASC,
                         CoreAlbums.TitleLowered ASC,
                         CoreTracks.Disc ASC,
                         CoreTracks.TrackNumber ASC", ascDesc); 
@@ -378,6 +381,7 @@ namespace Banshee.Query
                 case "album":
                     sort_query = String.Format (@"
                         CoreAlbums.TitleLowered {0},
+                        CoreTracks.Year ASC,
                         CoreTracks.Disc ASC,
                         CoreTracks.TrackNumber ASC", ascDesc); 
                     break;
@@ -386,6 +390,7 @@ namespace Banshee.Query
                     sort_query = String.Format (@"
                         CoreTracks.TitleLowered {0},
                         CoreAlbums.ArtistNameLowered ASC, 
+                        CoreTracks.Year ASC,
                         CoreAlbums.TitleLowered ASC", ascDesc); 
                     break;
 
@@ -396,6 +401,7 @@ namespace Banshee.Query
                 case "disc":
                     sort_query = String.Format (@"
                         CoreAlbums.ArtistNameLowered ASC, 
+                        CoreTracks.Year ASC,
                         CoreAlbums.TitleLowered ASC, 
                         CoreTracks.Disc {0},
                         CoreTracks.TrackNumber ASC", ascDesc);
