diff --git a/ui-core/src/commonMain/kotlin/ca/gosyer/jui/uicore/components/KeyboardHandler.kt b/ui-core/src/commonMain/kotlin/ca/gosyer/jui/uicore/components/KeyboardHandler.kt
index 5a2f9be4..d5a890ac 100644
--- a/ui-core/src/commonMain/kotlin/ca/gosyer/jui/uicore/components/KeyboardHandler.kt
+++ b/ui-core/src/commonMain/kotlin/ca/gosyer/jui/uicore/components/KeyboardHandler.kt
@@ -24,7 +24,7 @@ fun Modifier.keyboardHandler(
     val focusManager = LocalFocusManager.current
     Modifier.onPreviewKeyEvent {
         if (it.type == KeyEventType.KeyDown) {
-            if (singleLine && it.key == Key.Enter) {
+            if (singleLine && (it.key == Key.Enter || it.key == Key.NumPadEnter)) {
                 enterAction?.invoke(focusManager) ?: action(focusManager)
                 true
             } else if (it.key == Key.Tab) {