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 5fed25e7..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
@@ -110,8 +110,13 @@ data class Contact(
         val firstMiddle = "$firstName $middleName".trim()
         val firstPart = if (startWithSurname) {
             if (surname.isNotEmpty() && firstMiddle.isNotEmpty()) {
-                "$surname," } else { surname }
-        } else { firstMiddle }
+                "$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()