diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/models/Contact.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/models/Contact.kt
index ae7c32dc..4011ccc5 100644
--- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/models/Contact.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/models/Contact.kt
@@ -108,7 +108,15 @@ data class Contact(
 
     fun getNameToDisplay(): String {
         val firstMiddle = "$firstName $middleName".trim()
-        val firstPart = if (startWithSurname) surname else firstMiddle
+        val firstPart = if (startWithSurname) {
+            if (surname.isNotEmpty() && firstMiddle.isNotEmpty()) {
+                "$surname,"
+            } else {
+                surname
+            }
+        } else {
+            firstMiddle
+        }
         val lastPart = if (startWithSurname) firstMiddle else surname
         val suffixComma = if (suffix.isEmpty()) "" else ", $suffix"
         val fullName = "$prefix $firstPart $lastPart$suffixComma".trim()