1 files changed, 5 insertions, 0 deletions
diff --git a/core/java/android/webkit/FindActionModeCallback.java b/core/java/android/webkit/FindActionModeCallback.java
index 641604ea65e1..7c2598740c40 100644
--- a/core/java/android/webkit/FindActionModeCallback.java
+++ b/core/java/android/webkit/FindActionModeCallback.java
@@ -182,6 +182,11 @@ class FindActionModeCallback implements ActionMode.Callback, TextWatcher,
 
     @Override
     public boolean onActionItemClicked(ActionMode mode, MenuItem item) {
+        if (mWebView == null) {
+            throw new AssertionError(
+                    "No WebView for FindActionModeCallback::onActionItemClicked");
+        }
+        mInput.hideSoftInputFromWindow(mWebView.getWindowToken(), 0);
         if (!mMatchesFound) {
             findAll();
             return true;