1 files changed, 5 insertions, 1 deletions
diff --git a/core/java/android/webkit/WebTextView.java b/core/java/android/webkit/WebTextView.java
index 092e2b5d6dbc..33f84a508f02 100644
--- a/core/java/android/webkit/WebTextView.java
+++ b/core/java/android/webkit/WebTextView.java
@@ -768,9 +768,13 @@ import junit.framework.Assert;
             imm.hideSoftInputFromWindow(getWindowToken(), 0);
         }
         mInsideRemove = true;
+        boolean isFocused = hasFocus();
         mWebView.removeView(this);
-        mWebView.requestFocus();
+        if (isFocused) {
+            mWebView.requestFocus();
+        }
         mInsideRemove = false;
+        mHandler.removeCallbacksAndMessages(null);
     }
 
     @Override