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 ec8b42a9..6991be37 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
@@ -36,9 +36,9 @@ import com.kabouzeid.gramophone.ui.activities.MainActivity;
 import com.kabouzeid.gramophone.ui.activities.SearchActivity;
 import com.kabouzeid.gramophone.ui.fragments.mainactivity.AbsMainActivityFragment;
 import com.kabouzeid.gramophone.ui.fragments.mainactivity.library.pager.AbsLibraryPagerRecyclerViewCustomGridSizeFragment;
-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.PlaylistsFragment;
 import com.kabouzeid.gramophone.ui.fragments.mainactivity.library.pager.SongsFragment;
 import com.kabouzeid.gramophone.util.PhonographColorUtil;
 import com.kabouzeid.gramophone.util.PreferenceUtil;
@@ -345,29 +345,29 @@ public class LibraryFragment extends AbsMainActivityFragment implements CabHolde
         sortOrderMenu.clear();
 
         if (fragment instanceof AlbumsFragment) {
-            sortOrderMenu.add(0, R.id.action_album_sort_asc, 0, R.string.sort_a_z)
+            sortOrderMenu.add(0, R.id.action_album_sort_order_asc, 0, R.string.sort_order_a_z)
                     .setChecked(currentSortOrder.equals(SortOrder.AlbumSortOrder.ALBUM_A_Z));
-            sortOrderMenu.add(0, R.id.action_album_sort_desc, 1, R.string.sort_z_a)
+            sortOrderMenu.add(0, R.id.action_album_sort_order_desc, 1, R.string.sort_order_z_a)
                     .setChecked(currentSortOrder.equals(SortOrder.AlbumSortOrder.ALBUM_Z_A));
-            sortOrderMenu.add(0, R.id.action_album_sort_artist, 2, R.string.sort_artist)
+            sortOrderMenu.add(0, R.id.action_album_sort_order_artist, 2, R.string.sort_order_artist)
                     .setChecked(currentSortOrder.equals(SortOrder.AlbumSortOrder.ALBUM_ARTIST));
-            sortOrderMenu.add(0, R.id.action_album_sort_year, 3, R.string.sort_year)
+            sortOrderMenu.add(0, R.id.action_album_sort_order_year, 3, R.string.sort_order_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)
+            sortOrderMenu.add(0, R.id.action_artist_sort_order_asc, 0, R.string.sort_order_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)
+            sortOrderMenu.add(0, R.id.action_artist_sort_order_desc, 1, R.string.sort_order_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)
+            sortOrderMenu.add(0, R.id.action_song_sort_order_asc, 0, R.string.sort_order_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)
+            sortOrderMenu.add(0, R.id.action_song_sort_order_desc, 1, R.string.sort_order_z_a)
                     .setChecked(currentSortOrder.equals(SortOrder.SongSortOrder.SONG_Z_A));
-            sortOrderMenu.add(0, R.id.action_song_sort_artist, 2, R.string.sort_artist)
+            sortOrderMenu.add(0, R.id.action_song_sort_order_artist, 2, R.string.sort_order_artist)
                     .setChecked(currentSortOrder.equals(SortOrder.SongSortOrder.SONG_ARTIST));
-            sortOrderMenu.add(0, R.id.action_song_sort_album, 3, R.string.sort_album)
+            sortOrderMenu.add(0, R.id.action_song_sort_order_album, 3, R.string.sort_order_album)
                     .setChecked(currentSortOrder.equals(SortOrder.SongSortOrder.SONG_ALBUM));
-            sortOrderMenu.add(0, R.id.action_song_sort_year, 4, R.string.sort_year)
+            sortOrderMenu.add(0, R.id.action_song_sort_order_year, 4, R.string.sort_order_year)
                     .setChecked(currentSortOrder.equals(SortOrder.SongSortOrder.SONG_YEAR));
         }
 
@@ -378,43 +378,43 @@ public class LibraryFragment extends AbsMainActivityFragment implements CabHolde
         String sortOrder = null;
         if (fragment instanceof AlbumsFragment) {
             switch (item.getItemId()) {
-                case R.id.action_album_sort_asc:
+                case R.id.action_album_sort_order_asc:
                     sortOrder = SortOrder.AlbumSortOrder.ALBUM_A_Z;
                     break;
-                case R.id.action_album_sort_desc:
+                case R.id.action_album_sort_order_desc:
                     sortOrder = SortOrder.AlbumSortOrder.ALBUM_Z_A;
                     break;
-                case R.id.action_album_sort_artist:
+                case R.id.action_album_sort_order_artist:
                     sortOrder = SortOrder.AlbumSortOrder.ALBUM_ARTIST;
                     break;
-                case R.id.action_album_sort_year:
+                case R.id.action_album_sort_order_year:
                     sortOrder = SortOrder.AlbumSortOrder.ALBUM_YEAR;
                     break;
             }
         } else if (fragment instanceof ArtistsFragment) {
             switch (item.getItemId()) {
-                case R.id.action_artist_sort_asc:
+                case R.id.action_artist_sort_order_asc:
                     sortOrder = SortOrder.ArtistSortOrder.ARTIST_A_Z;
                     break;
-                case R.id.action_artist_sort_desc:
+                case R.id.action_artist_sort_order_desc:
                     sortOrder = SortOrder.ArtistSortOrder.ARTIST_Z_A;
                     break;
             }
         } else if (fragment instanceof SongsFragment) {
             switch (item.getItemId()) {
-                case R.id.action_song_sort_asc:
+                case R.id.action_song_sort_order_asc:
                     sortOrder = SortOrder.SongSortOrder.SONG_A_Z;
                     break;
-                case R.id.action_song_sort_desc:
+                case R.id.action_song_sort_order_desc:
                     sortOrder = SortOrder.SongSortOrder.SONG_Z_A;
                     break;
-                case R.id.action_song_sort_artist:
+                case R.id.action_song_sort_order_artist:
                     sortOrder = SortOrder.SongSortOrder.SONG_ARTIST;
                     break;
-                case R.id.action_song_sort_album:
+                case R.id.action_song_sort_order_album:
                     sortOrder = SortOrder.SongSortOrder.SONG_ALBUM;
                     break;
-                case R.id.action_song_sort_year:
+                case R.id.action_song_sort_order_year:
                     sortOrder = SortOrder.SongSortOrder.SONG_YEAR;
                     break;
             }
diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/pager/AbsLibraryPagerRecyclerViewCustomGridSizeFragment.java b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/pager/AbsLibraryPagerRecyclerViewCustomGridSizeFragment.java
index 95078f46..a5b69d78 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/pager/AbsLibraryPagerRecyclerViewCustomGridSizeFragment.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/pager/AbsLibraryPagerRecyclerViewCustomGridSizeFragment.java
@@ -83,6 +83,7 @@ public abstract class AbsLibraryPagerRecyclerViewCustomGridSizeFragment<A extend
     public void setAndSaveSortOrder(final String sortOrder) {
         this.sortOrder = sortOrder;
         saveSortOrder(sortOrder);
+        setSortOrder(sortOrder);
     }
 
     /**
@@ -149,6 +150,8 @@ public abstract class AbsLibraryPagerRecyclerViewCustomGridSizeFragment<A extend
 
     protected abstract void saveSortOrder(String sortOrder);
 
+    protected abstract void setSortOrder(String sortOrder);
+
     protected int getMaxGridSizeForList() {
         if (isLandscape()) {
             return getActivity().getResources().getInteger(R.integer.default_list_columns_land);
diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/pager/AlbumsFragment.java b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/pager/AlbumsFragment.java
index 1f5aa317..5c5939a6 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/pager/AlbumsFragment.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/pager/AlbumsFragment.java
@@ -63,8 +63,11 @@ public class AlbumsFragment extends AbsLibraryPagerRecyclerViewCustomGridSizeFra
     @Override
     protected void saveSortOrder(String sortOrder) {
         PreferenceUtil.getInstance(getActivity()).setAlbumSortOrder(sortOrder);
-        onMediaStoreChanged();
-        getAdapter().notifyDataSetChanged();
+    }
+
+    @Override
+    protected void setSortOrder(String sortOrder) {
+        getLoaderManager().restartLoader(LOADER_ID, null, this);
     }
 
     @Override
diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/pager/ArtistsFragment.java b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/pager/ArtistsFragment.java
index f719758c..06687d38 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/pager/ArtistsFragment.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/pager/ArtistsFragment.java
@@ -70,8 +70,11 @@ public class ArtistsFragment extends AbsLibraryPagerRecyclerViewCustomGridSizeFr
     @Override
     protected void saveSortOrder(String sortOrder) {
         PreferenceUtil.getInstance(getActivity()).setArtistSortOrder(sortOrder);
-        onMediaStoreChanged();
-        getAdapter().notifyDataSetChanged();
+    }
+
+    @Override
+    protected void setSortOrder(String sortOrder) {
+        getLoaderManager().restartLoader(LOADER_ID, null, this);
     }
 
     @Override
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 63f1a6bd..076fe4f3 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
@@ -81,8 +81,11 @@ public class SongsFragment extends AbsLibraryPagerRecyclerViewCustomGridSizeFrag
     @Override
     protected void saveSortOrder(String sortOrder) {
         PreferenceUtil.getInstance(getActivity()).setSongSortOrder(sortOrder);
-        onMediaStoreChanged();
-        getAdapter().notifyDataSetChanged();
+    }
+
+    @Override
+    protected void setSortOrder(String sortOrder) {
+        getLoaderManager().restartLoader(LOADER_ID, null, this);
     }
 
     @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 b00ff57b..5b85cbe7 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/util/PreferenceUtil.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/util/PreferenceUtil.java
@@ -225,7 +225,7 @@ public final class PreferenceUtil {
     public void setArtistSortOrder(final String sortOrder) {
         final SharedPreferences.Editor editor = mPreferences.edit();
         editor.putString(ARTIST_SORT_ORDER, sortOrder);
-        editor.apply();
+        editor.commit();
     }
 
     public final String getArtistSongSortOrder() {
@@ -243,7 +243,7 @@ public final class PreferenceUtil {
     public void setAlbumSortOrder(final String sortOrder) {
         final SharedPreferences.Editor editor = mPreferences.edit();
         editor.putString(ALBUM_SORT_ORDER, sortOrder);
-        editor.apply();
+        editor.commit();
     }
 
     public final String getAlbumSongSortOrder() {
@@ -257,7 +257,7 @@ public final class PreferenceUtil {
     public void setSongSortOrder(final String sortOrder) {
         final SharedPreferences.Editor editor = mPreferences.edit();
         editor.putString(SONG_SORT_ORDER, sortOrder);
-        editor.apply();
+        editor.commit();
     }
 
     public final String getGenreSortOrder() {
diff --git a/app/src/main/res/values/ids.xml b/app/src/main/res/values/ids.xml
index ce45f3f7..ef5fe97a 100644
--- a/app/src/main/res/values/ids.xml
+++ b/app/src/main/res/values/ids.xml
@@ -3,15 +3,15 @@
     <item name="action_new_playlist" type="id" />
     <item name="action_show_lyrics" type="id" />
 
-    <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" />
+    <item name="action_album_sort_order_asc" type="id" />
+    <item name="action_album_sort_order_desc" type="id" />
+    <item name="action_album_sort_order_artist" type="id" />
+    <item name="action_album_sort_order_year" type="id" />
+    <item name="action_artist_sort_order_asc" type="id" />
+    <item name="action_artist_sort_order_desc" type="id" />
+    <item name="action_song_sort_order_asc" type="id" />
+    <item name="action_song_sort_order_desc" type="id" />
+    <item name="action_song_sort_order_artist" type="id" />
+    <item name="action_song_sort_order_album" type="id" />
+    <item name="action_song_sort_order_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 6696f524..a9cdfb07 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -296,9 +296,9 @@
     <string name="pref_summary_library_categories">Configure visibility and order of library categories.</string>
     <string name="you_have_to_select_at_least_one_category">You have to select at least one category.</string>
     <string name="action_sort_order">Sort order</string>
-    <string name="sort_a_z">Ascending</string>
-    <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>
+    <string name="sort_order_a_z">Ascending</string>
+    <string name="sort_order_z_a">Descending</string>
+    <string name="sort_order_artist">Artist</string>
+    <string name="sort_order_album">Album</string>
+    <string name="sort_order_year">Year</string>
 </resources>