diff --git a/ui/src/main/java/com/getbubblenow/android/activity/LoginActivity.java b/ui/src/main/java/com/getbubblenow/android/activity/LoginActivity.java
index a420a98..9ecadb8 100644
--- a/ui/src/main/java/com/getbubblenow/android/activity/LoginActivity.java
+++ b/ui/src/main/java/com/getbubblenow/android/activity/LoginActivity.java
@@ -86,9 +86,11 @@ public class LoginActivity extends BaseActivityBubble {
                 if(((event!=null)&&(event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) || (actionId == EditorInfo.IME_ACTION_SEND)){
                     if(!TextUtils.isEmpty(password.getText().toString()) && !TextUtils.isEmpty(userName.getText().toString())) {
                         signIn();
+                        return true;
                     }
                     else {
                         Toast.makeText(LoginActivity.this,getString(R.string.empty_message),Toast.LENGTH_SHORT).show();
+                        return true;
                     }
                 }
                 return false;