diff --git a/apps/playlist.c b/apps/playlist.c
index 76e177daeb..0052672e25 100644
--- a/apps/playlist.c
+++ b/apps/playlist.c
@@ -416,14 +416,31 @@ static int compare(const void* p1, const void* p2)
 }
 
 /*
- * sort the array of indices for the playlist
+ * Sort the array of indices for the playlist. If start_current is true then
+ * set the index to the new index of the current song.
  */
-void sort_playlist(void)
+void sort_playlist(bool start_current)
 {
+    int i;
+    int current = playlist.indices[playlist.index];
+
     if (playlist.amount > 0)
     {
         qsort(&playlist.indices, playlist.amount, sizeof(playlist.indices[0]), compare);
     }
+
+    if (start_current)
+    {
+        /* Set the index to the current song */
+        for (i=0; i<playlist.amount; i++)
+        {
+            if (playlist.indices[i] == current)
+            {
+                playlist.index = i;
+                break;
+            }
+        }
+    }
 }
 
 /* -----------------------------------------------------------------
diff --git a/apps/playlist.h b/apps/playlist.h
index 86de8265c9..5abeec3176 100644
--- a/apps/playlist.h
+++ b/apps/playlist.h
@@ -44,7 +44,7 @@ int play_list(char *dir, char *file, int start_index,
               bool shuffled_index, int start_offset, int random_seed );
 char* playlist_next(int steps, int* id);
 void randomise_playlist( unsigned int seed );
-void sort_playlist(void);
+void sort_playlist(bool start_current);
 void empty_playlist(void);
 void add_indices_to_playlist(void);
 void playlist_clear(void);
diff --git a/apps/settings_menu.c b/apps/settings_menu.c
index 9b41a497ae..c3f3bccb61 100644
--- a/apps/settings_menu.c
+++ b/apps/settings_menu.c
@@ -208,7 +208,7 @@ Menu settings_menu(void)
         }
         else
         {
-            sort_playlist();
+            sort_playlist(true);
         }
     }
     return result;