diff --git a/mobile/src/com/cradle/iitc_mobile/IITC_Mobile.java b/mobile/src/com/cradle/iitc_mobile/IITC_Mobile.java
index eac3b86a..f3d1857a 100644
--- a/mobile/src/com/cradle/iitc_mobile/IITC_Mobile.java
+++ b/mobile/src/com/cradle/iitc_mobile/IITC_Mobile.java
@@ -104,7 +104,9 @@ public class IITC_Mobile extends Activity
         mEditCommand.setOnEditorActionListener(new TextView.OnEditorActionListener() {
             @Override
             public boolean onEditorAction(final TextView v, final int actionId, final KeyEvent event) {
-                if (EditorInfo.IME_ACTION_GO == actionId) {
+                if (EditorInfo.IME_ACTION_GO == actionId ||
+                        EditorInfo.IME_ACTION_SEND == actionId ||
+                        EditorInfo.IME_ACTION_DONE == actionId) {
                     onBtnRunCodeClick(v);
 
                     final InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);