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 8e89ceed..5fed25e7 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,10 @@ data class Contact(
 
     fun getNameToDisplay(): String {
         val firstMiddle = "$firstName $middleName".trim()
-        val firstPart = if (startWithSurname) if (surname.isNotEmpty() && firstMiddle.isNotEmpty()) "$surname," else 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()