diff --git a/src/com/android/dialer/DialtactsActivity.java b/src/com/android/dialer/DialtactsActivity.java
index 4149f39..39f611e 100644
--- a/src/com/android/dialer/DialtactsActivity.java
+++ b/src/com/android/dialer/DialtactsActivity.java
@@ -610,7 +610,11 @@
 
         mListsFragment.maybeShowActionBar();
         if (isInSearchUi()) {
-            mSearchIcon.setVisibility(View.GONE);
+            if (TextUtils.isEmpty(mSearchQuery)) {
+                exitSearchUi();
+            } else {
+                mSearchIcon.setVisibility(View.GONE);
+            }
         }
     }