diff --git a/services/java/com/android/server/InputMethodManagerService.java b/services/java/com/android/server/InputMethodManagerService.java
index 5a995aed847a9..bc8607eb6c381 100644
--- a/services/java/com/android/server/InputMethodManagerService.java
+++ b/services/java/com/android/server/InputMethodManagerService.java
@@ -1225,6 +1225,7 @@ public class InputMethodManagerService extends IInputMethodManager.Stub
             if (mCurClient == null || client == null
                     || mCurClient.client.asBinder() != client.asBinder()) {
                 Slog.w(TAG, "Ignoring showInputMethodDialogFromClient of: " + client);
+                return;
             }
 
             mHandler.sendEmptyMessage(MSG_SHOW_IM_PICKER);