diff --git a/app/src/main/java/com/dessalines/thumbkey/ui/components/keyboard/KeyboardScreen.kt b/app/src/main/java/com/dessalines/thumbkey/ui/components/keyboard/KeyboardScreen.kt
index 66e2274e..4a137178 100644
--- a/app/src/main/java/com/dessalines/thumbkey/ui/components/keyboard/KeyboardScreen.kt
+++ b/app/src/main/java/com/dessalines/thumbkey/ui/components/keyboard/KeyboardScreen.kt
@@ -438,10 +438,12 @@ fun KeyboardScreen(
                                             KeyboardMode.MAIN -> keyboardDefinition.modes.shifted
                                             KeyboardMode.SHIFTED -> keyboardDefinition.modes.main
                                             else -> null
-                                        }?.arr?.get(i)?.get(j),
+                                        }?.arr?.getOrNull(i)?.getOrNull(j),
                                     numericKey =
                                         when (mode) {
-                                            KeyboardMode.MAIN, KeyboardMode.SHIFTED -> keyboardDefinition.modes.numeric.arr[i][j]
+                                            KeyboardMode.MAIN, KeyboardMode.SHIFTED ->
+                                                keyboardDefinition.modes.numeric.arr
+                                                    .getOrNull(i)?.getOrNull(j)
                                             else -> null
                                         },
                                     dragReturnEnabled = dragReturnEnabled,