diff --git a/ChangeLog b/ChangeLog
index a5a9462c0..0724fcfa8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -54,6 +54,7 @@
 38. Support dragging folder of music files onto playqueue.
 39. Add original date to playlist table columns.
 40. Add option to use 'Original Year' to display and sort albums.
+41. Sort folder view items, as MPD does not seem to sort playlist names.
 
 2.2.0
 -----
diff --git a/mpd-interface/mpdparseutils.cpp b/mpd-interface/mpdparseutils.cpp
index 1090eede3..6f73c27a2 100644
--- a/mpd-interface/mpdparseutils.cpp
+++ b/mpd-interface/mpdparseutils.cpp
@@ -744,6 +744,9 @@ void MPDParseUtils::parseDirItems(const QByteArray &data, const QString &mpdDir,
             }
         }
     }
+    if (Loc_Browse==loc) {
+        qSort(songs);
+    }
     songList+=songs;
 }