diff --git a/app/src/main/java/com/kabouzeid/gramophone/adapter/album/AlbumAdapter.java b/app/src/main/java/com/kabouzeid/gramophone/adapter/album/AlbumAdapter.java
index eefbbe7a..8fc86c44 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/adapter/album/AlbumAdapter.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/adapter/album/AlbumAdapter.java
@@ -198,8 +198,7 @@ public class AlbumAdapter extends AbsMultiSelectAdapter<AlbumAdapter.ViewHolder,
                 sectionName = dataSet.get(position).getArtistName();
                 break;
             case SortOrder.AlbumSortOrder.ALBUM_YEAR:
-                sectionName = Integer.toString(dataSet.get(position).getYear());
-                break;
+                return Integer.toString(dataSet.get(position).getYear());
         }
 
         return MusicUtil.getSectionName(sectionName);
diff --git a/app/src/main/java/com/kabouzeid/gramophone/adapter/song/SongAdapter.java b/app/src/main/java/com/kabouzeid/gramophone/adapter/song/SongAdapter.java
index d117b07c..1faa6f07 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/adapter/song/SongAdapter.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/adapter/song/SongAdapter.java
@@ -190,24 +190,22 @@ public class SongAdapter extends AbsMultiSelectAdapter<SongAdapter.ViewHolder, S
             return "";
         }
 
-//        @Nullable String sectionName = null;
-//        switch (PreferenceUtil.getInstance(activity).getSongSortOrder()) {
-//            case SortOrder.SongSortOrder.SONG_A_Z:
-//            case SortOrder.SongSortOrder.SONG_Z_A:
-//                sectionName = dataSet.get(position).title;
-//                break;
-//            case SortOrder.SongSortOrder.SONG_ALBUM:
-//                sectionName = dataSet.get(position).albumName;
-//                break;
-//            case SortOrder.SongSortOrder.SONG_ARTIST:
-//                sectionName = dataSet.get(position).artistName;
-//                break;
-//            case SortOrder.SongSortOrder.SONG_YEAR:
-//                sectionName = Integer.toString(dataSet.get(position).year);
-//                break;
-//        }
+        @Nullable String sectionName = null;
+        switch (PreferenceUtil.getInstance(activity).getSongSortOrder()) {
+            case SortOrder.SongSortOrder.SONG_A_Z:
+            case SortOrder.SongSortOrder.SONG_Z_A:
+                sectionName = dataSet.get(position).title;
+                break;
+            case SortOrder.SongSortOrder.SONG_ALBUM:
+                sectionName = dataSet.get(position).albumName;
+                break;
+            case SortOrder.SongSortOrder.SONG_ARTIST:
+                sectionName = dataSet.get(position).artistName;
+                break;
+            case SortOrder.SongSortOrder.SONG_YEAR:
+                return Integer.toString(dataSet.get(position).year);
+        }
 
-        String sectionName = dataSet.get(position).title;
         return MusicUtil.getSectionName(sectionName);
     }
 
diff --git a/app/src/main/java/com/kabouzeid/gramophone/helper/SortOrder.java b/app/src/main/java/com/kabouzeid/gramophone/helper/SortOrder.java
index 6226ae24..89e750e2 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/helper/SortOrder.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/helper/SortOrder.java
@@ -64,8 +64,7 @@ public final class SortOrder {
                 + ", " + MediaStore.Audio.Albums.DEFAULT_SORT_ORDER;
 
         /* Album sort order year */
-        String ALBUM_YEAR = MediaStore.Audio.Albums.FIRST_YEAR + " DESC";
-
+        String ALBUM_YEAR = MediaStore.Audio.Media.YEAR + " DESC";
     }
 
     /**
diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/LibraryFragment.java b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/LibraryFragment.java
index 45d22e65..ec8b42a9 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/LibraryFragment.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/LibraryFragment.java
@@ -39,6 +39,7 @@ import com.kabouzeid.gramophone.ui.fragments.mainactivity.library.pager.AbsLibra
 import com.kabouzeid.gramophone.ui.fragments.mainactivity.library.pager.PlaylistsFragment;
 import com.kabouzeid.gramophone.ui.fragments.mainactivity.library.pager.AlbumsFragment;
 import com.kabouzeid.gramophone.ui.fragments.mainactivity.library.pager.ArtistsFragment;
+import com.kabouzeid.gramophone.ui.fragments.mainactivity.library.pager.SongsFragment;
 import com.kabouzeid.gramophone.util.PhonographColorUtil;
 import com.kabouzeid.gramophone.util.PreferenceUtil;
 import com.kabouzeid.gramophone.util.Util;
@@ -350,11 +351,24 @@ public class LibraryFragment extends AbsMainActivityFragment implements CabHolde
                     .setChecked(currentSortOrder.equals(SortOrder.AlbumSortOrder.ALBUM_Z_A));
             sortOrderMenu.add(0, R.id.action_album_sort_artist, 2, R.string.sort_artist)
                     .setChecked(currentSortOrder.equals(SortOrder.AlbumSortOrder.ALBUM_ARTIST));
+            sortOrderMenu.add(0, R.id.action_album_sort_year, 3, R.string.sort_year)
+                    .setChecked(currentSortOrder.equals(SortOrder.AlbumSortOrder.ALBUM_YEAR));
         } else if (fragment instanceof ArtistsFragment) {
             sortOrderMenu.add(0, R.id.action_artist_sort_asc, 0, R.string.sort_a_z)
                     .setChecked(currentSortOrder.equals(SortOrder.ArtistSortOrder.ARTIST_A_Z));
             sortOrderMenu.add(0, R.id.action_artist_sort_desc, 1, R.string.sort_z_a)
                     .setChecked(currentSortOrder.equals(SortOrder.ArtistSortOrder.ARTIST_Z_A));
+        } else if (fragment instanceof SongsFragment) {
+            sortOrderMenu.add(0, R.id.action_song_sort_asc, 0, R.string.sort_a_z)
+                    .setChecked(currentSortOrder.equals(SortOrder.SongSortOrder.SONG_A_Z));
+            sortOrderMenu.add(0, R.id.action_song_sort_desc, 1, R.string.sort_z_a)
+                    .setChecked(currentSortOrder.equals(SortOrder.SongSortOrder.SONG_Z_A));
+            sortOrderMenu.add(0, R.id.action_song_sort_artist, 2, R.string.sort_artist)
+                    .setChecked(currentSortOrder.equals(SortOrder.SongSortOrder.SONG_ARTIST));
+            sortOrderMenu.add(0, R.id.action_song_sort_album, 3, R.string.sort_album)
+                    .setChecked(currentSortOrder.equals(SortOrder.SongSortOrder.SONG_ALBUM));
+            sortOrderMenu.add(0, R.id.action_song_sort_year, 4, R.string.sort_year)
+                    .setChecked(currentSortOrder.equals(SortOrder.SongSortOrder.SONG_YEAR));
         }
 
         sortOrderMenu.setGroupCheckable(0, true, true);
@@ -373,6 +387,9 @@ public class LibraryFragment extends AbsMainActivityFragment implements CabHolde
                 case R.id.action_album_sort_artist:
                     sortOrder = SortOrder.AlbumSortOrder.ALBUM_ARTIST;
                     break;
+                case R.id.action_album_sort_year:
+                    sortOrder = SortOrder.AlbumSortOrder.ALBUM_YEAR;
+                    break;
             }
         } else if (fragment instanceof ArtistsFragment) {
             switch (item.getItemId()) {
@@ -383,6 +400,24 @@ public class LibraryFragment extends AbsMainActivityFragment implements CabHolde
                     sortOrder = SortOrder.ArtistSortOrder.ARTIST_Z_A;
                     break;
             }
+        } else if (fragment instanceof SongsFragment) {
+            switch (item.getItemId()) {
+                case R.id.action_song_sort_asc:
+                    sortOrder = SortOrder.SongSortOrder.SONG_A_Z;
+                    break;
+                case R.id.action_song_sort_desc:
+                    sortOrder = SortOrder.SongSortOrder.SONG_Z_A;
+                    break;
+                case R.id.action_song_sort_artist:
+                    sortOrder = SortOrder.SongSortOrder.SONG_ARTIST;
+                    break;
+                case R.id.action_song_sort_album:
+                    sortOrder = SortOrder.SongSortOrder.SONG_ALBUM;
+                    break;
+                case R.id.action_song_sort_year:
+                    sortOrder = SortOrder.SongSortOrder.SONG_YEAR;
+                    break;
+            }
         }
 
         if (sortOrder != null) {
diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/pager/SongsFragment.java b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/pager/SongsFragment.java
index 295d97f6..63f1a6bd 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/pager/SongsFragment.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/pager/SongsFragment.java
@@ -80,7 +80,9 @@ public class SongsFragment extends AbsLibraryPagerRecyclerViewCustomGridSizeFrag
 
     @Override
     protected void saveSortOrder(String sortOrder) {
-        //PreferenceUtil.getInstance(getActivity()).setSongSortOrder(sortOrder);
+        PreferenceUtil.getInstance(getActivity()).setSongSortOrder(sortOrder);
+        onMediaStoreChanged();
+        getAdapter().notifyDataSetChanged();
     }
 
     @Override
diff --git a/app/src/main/java/com/kabouzeid/gramophone/util/PreferenceUtil.java b/app/src/main/java/com/kabouzeid/gramophone/util/PreferenceUtil.java
index 258e12cc..b00ff57b 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/util/PreferenceUtil.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/util/PreferenceUtil.java
@@ -254,6 +254,12 @@ public final class PreferenceUtil {
         return mPreferences.getString(SONG_SORT_ORDER, SortOrder.SongSortOrder.SONG_A_Z);
     }
 
+    public void setSongSortOrder(final String sortOrder) {
+        final SharedPreferences.Editor editor = mPreferences.edit();
+        editor.putString(SONG_SORT_ORDER, sortOrder);
+        editor.apply();
+    }
+
     public final String getGenreSortOrder() {
         return mPreferences.getString(GENRE_SORT_ORDER, SortOrder.GenreSortOrder.GENRE_A_Z);
     }
diff --git a/app/src/main/res/values/ids.xml b/app/src/main/res/values/ids.xml
index b1a163af..ce45f3f7 100644
--- a/app/src/main/res/values/ids.xml
+++ b/app/src/main/res/values/ids.xml
@@ -6,6 +6,12 @@
     <item name="action_album_sort_asc" type="id" />
     <item name="action_album_sort_desc" type="id" />
     <item name="action_album_sort_artist" type="id" />
+    <item name="action_album_sort_year" type="id" />
     <item name="action_artist_sort_asc" type="id" />
     <item name="action_artist_sort_desc" type="id" />
+    <item name="action_song_sort_asc" type="id" />
+    <item name="action_song_sort_desc" type="id" />
+    <item name="action_song_sort_artist" type="id" />
+    <item name="action_song_sort_album" type="id" />
+    <item name="action_song_sort_year" type="id" />
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 789952f1..727ab34e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -299,4 +299,5 @@
     <string name="sort_z_a">Descending</string>
     <string name="sort_artist">Artist</string>
     <string name="sort_album">Album</string>
+    <string name="sort_year">Year</string>
 </resources>