diff --git a/app/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java b/app/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java
index fffa94b20..e02902791 100644
--- a/app/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java
+++ b/app/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java
@@ -529,7 +529,8 @@ public final class TaskListFragment extends InjectingFragment
   }
 
   boolean collapseSearchView() {
-    return search.isActionViewExpanded() && search.collapseActionView();
+    return search.isActionViewExpanded()
+        && (search.collapseActionView() || !search.isActionViewExpanded());
   }
 
   private void refresh() {