diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index a64827af32c20..22091c7a70efd 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -9817,6 +9817,9 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
     public void dispatchFinishTemporaryDetach() {
         onFinishTemporaryDetach();
         mPrivateFlags3 &= ~PFLAG3_TEMPORARY_DETACH;
+        if (hasWindowFocus() && hasFocus()) {
+            InputMethodManager.getInstance().focusIn(this);
+        }
     }
 
     /**