diff --git a/Ports/Android/src/com/codename1/impl/android/InPlaceEditView.java b/Ports/Android/src/com/codename1/impl/android/InPlaceEditView.java
index 7fd1e47165..6c6ab7dda8 100644
--- a/Ports/Android/src/com/codename1/impl/android/InPlaceEditView.java
+++ b/Ports/Android/src/com/codename1/impl/android/InPlaceEditView.java
@@ -2160,6 +2160,10 @@ public boolean onKeyDown(int keyCode, KeyEvent event) {
                 case KeyEvent.KEYCODE_MENU:
                     endEditing(InPlaceEditView.REASON_SYSTEM_KEY, false, true, 0);
                     break;
+		case KeyEvent.KEYCODE_ENTER:
+                    if (mEditText.mTextArea != null && mEditText.mTextArea.isSingleLineTextArea())
+                        onEditorAction(EditorInfo.IME_ACTION_DONE);
+                    break;
                 case KeyEvent.KEYCODE_ESCAPE:
                     endEditing(InPlaceEditView.REASON_IME_ACTION, false, true, EditorInfo.IME_ACTION_DONE, keyCode);
                     break;