diff --git a/src/library/librarymodel.cpp b/src/library/librarymodel.cpp
index 773798241..bc1c5eb02 100644
--- a/src/library/librarymodel.cpp
+++ b/src/library/librarymodel.cpp
@@ -160,12 +160,18 @@ QString LibraryModel::DividerKey(GroupBy type, LibraryItem* item) const {
   case GroupBy_Composer:
   case GroupBy_Genre:
   case GroupBy_AlbumArtist:
-  case GroupBy_FileType:
+  case GroupBy_FileType: {
     if (item->sort_text[0].isDigit())
       return "0";
     if (item->sort_text[0] == ' ')
       return QString();
-    return QString(item->sort_text[0]);
+
+    QChar c = item->sort_text[0];
+    if (c.decompositionTag() != QChar::NoDecomposition)
+      c = c.decomposition()[0];
+
+    return c.toLower();
+  }
 
   case GroupBy_Year:
     return SortTextForYear(item->sort_text.toInt() / 10 * 10);
diff --git a/src/ui/mainwindow.cpp b/src/ui/mainwindow.cpp
index 7767c6734..710bed306 100644
--- a/src/ui/mainwindow.cpp
+++ b/src/ui/mainwindow.cpp
@@ -202,6 +202,7 @@ MainWindow::MainWindow(NetworkAccessManager* network, Engine::Type engine, QWidg
   library_sort_model_->setSourceModel(library_->model());
   library_sort_model_->setSortRole(LibraryModel::Role_SortText);
   library_sort_model_->setDynamicSortFilter(true);
+  library_sort_model_->setSortLocaleAware(true);
   library_sort_model_->sort(0);
 
   ui_->playlist->SetManager(playlists_);