diff --git a/ui/editable-text-base/editable-text-base.android.ts b/ui/editable-text-base/editable-text-base.android.ts
index eca950091..b24c23cca 100644
--- a/ui/editable-text-base/editable-text-base.android.ts
+++ b/ui/editable-text-base/editable-text-base.android.ts
@@ -84,15 +84,9 @@ export class EditableTextBase extends common.EditableTextBase {
         var editorActionListener = new android.widget.TextView.OnEditorActionListener({
             onEditorAction: function (textView: android.widget.TextView, actionId: number, event: android.view.KeyEvent): boolean {
                 var owner = that.get();
-                if (owner) {
-                    if (actionId === android.view.inputmethod.EditorInfo.IME_ACTION_DONE ||
-                        actionId === android.view.inputmethod.EditorInfo.IME_ACTION_GO ||
-                        actionId === android.view.inputmethod.EditorInfo.IME_ACTION_SEARCH ||
-                        actionId === android.view.inputmethod.EditorInfo.IME_ACTION_SEND ||
-                        actionId === android.view.inputmethod.EditorInfo.IME_ACTION_NEXT) {
-                        owner.dismissSoftInput();
-                        owner._onReturnPress();
-                    }
+                if (owner && event.getKeyCode() === android.view.KeyEvent.KEYCODE_ENTER) {
+                      owner.dismissSoftInput();
+                      owner._onReturnPress();
                 }
 
                 return false;