diff --git a/src/collection/collectionmodel.cpp b/src/collection/collectionmodel.cpp
index bd1e1b078..13d682050 100644
--- a/src/collection/collectionmodel.cpp
+++ b/src/collection/collectionmodel.cpp
@@ -1567,8 +1567,9 @@ void CollectionModel::FinishItem(const GroupBy type, const bool signal, const bo
   // Create the divider entry if we're supposed to
   if (create_divider && show_dividers_) {
     QString divider_key = DividerKey(type, item);
-    if (!divider_key.isEmpty() && (item->sort_text.isEmpty() || item->sort_text[0].toLower() != divider_key || divider_key[0].isDigit()))
-      item->sort_text.prepend(divider_key);
+    if (!divider_key.isEmpty()) {
+      item->sort_text.prepend(divider_key + " ");
+    }
 
     if (!divider_key.isEmpty() && !divider_nodes_.contains(divider_key)) {
       if (signal)
@@ -1577,7 +1578,7 @@ void CollectionModel::FinishItem(const GroupBy type, const bool signal, const bo
       CollectionItem *divider = new CollectionItem(CollectionItem::Type_Divider, root_);
       divider->key = divider_key;
       divider->display_text = DividerDisplayText(type, divider_key);
-      divider->sort_text = divider_key + "0000";
+      divider->sort_text = divider_key + "  ";
       divider->lazy_loaded = true;
 
       divider_nodes_[divider_key] = divider;