diff --git a/src/com/android/launcher/Launcher.java b/src/com/android/launcher/Launcher.java
index 01001c0..af1b0f3 100644
--- a/src/com/android/launcher/Launcher.java
+++ b/src/com/android/launcher/Launcher.java
@@ -721,7 +721,7 @@
                 if (v != null && v.getWindowToken() != null) {
                     InputMethodManager imm = (InputMethodManager)getSystemService(
                             INPUT_METHOD_SERVICE);
-                    imm.hideSoftInputFromWindow(v.getWindowToken());
+                    imm.hideSoftInputFromWindow(v.getWindowToken(), 0);
                 }
             } else {
                 closeDrawer(false);
diff --git a/src/com/android/launcher/Search.java b/src/com/android/launcher/Search.java
index b330527..41d6562 100644
--- a/src/com/android/launcher/Search.java
+++ b/src/com/android/launcher/Search.java
@@ -105,6 +105,7 @@
         Bundle appData = new Bundle();
         appData.putString(SearchManager.SOURCE, "launcher-widget");
         sendLaunchIntent(Intent.ACTION_SEARCH, null, query, appData, 0, null, mSearchable);
+        clearQuery();
     }
     
     /**
@@ -359,6 +360,7 @@
                 String suggestionQuery = mSuggestionQuery;
                 sendLaunchIntent(suggestionAction, suggestionData, suggestionQuery, null,
                                     KeyEvent.KEYCODE_UNKNOWN, null, si);
+                clearQuery();
                 return true;
             }
         }