diff --git a/Ports/Android/src/com/codename1/impl/android/CodenameOneView.java b/Ports/Android/src/com/codename1/impl/android/CodenameOneView.java
index bcdcf1b7d8..d93595ab4b 100644
--- a/Ports/Android/src/com/codename1/impl/android/CodenameOneView.java
+++ b/Ports/Android/src/com/codename1/impl/android/CodenameOneView.java
@@ -277,12 +277,16 @@ public boolean onKeyUpDown(boolean down, int keyCode, KeyEvent event) {
             case KeyEvent.KEYCODE_SYM:
             return false;
             case KeyEvent.KEYCODE_ENTER:
-            	if (down) {
-                    Display.getInstance().keyPressed(keyCode);
-                } else {
-                    Display.getInstance().keyReleased(keyCode);
+                if(Display.getInstance().getProperty("sendEnterKey", "false").equals("true")) {
+                	if (down) {
+                        Display.getInstance().keyPressed(keyCode);
+                    } else {
+                        Display.getInstance().keyReleased(keyCode);
+                    }
+               	    return false;
                 }
-            	return false;
+                break;
+                
             default:
         }