diff --git a/feature/converter/src/main/java/app/myzel394/numberhub/feature/converter/components/ConverterKeyboard.kt b/feature/converter/src/main/java/app/myzel394/numberhub/feature/converter/components/ConverterKeyboard.kt
index cd343f43..327fa6dc 100644
--- a/feature/converter/src/main/java/app/myzel394/numberhub/feature/converter/components/ConverterKeyboard.kt
+++ b/feature/converter/src/main/java/app/myzel394/numberhub/feature/converter/components/ConverterKeyboard.kt
@@ -440,10 +440,9 @@ internal fun NumberBaseKeyboard(
                     }
 
                     else -> {
-                        val lettersAmount = (10..<amount.coerceAtMost(16)).count().toFloat()
-                        val rowsAmount = ceil(lettersAmount / columns.toFloat()).toInt()
+                        val rowsAmount = ceil((amount - 10) / 3f).toInt()
 
-                        for (row in rowsAmount downTo 0) {
+                        for (row in (rowsAmount - 1) downTo 0) {
                             Row(
                                 Modifier.fillMaxWidth(),
                                 horizontalArrangement = Arrangement.spacedBy(horizontalSpacing),