diff --git a/app/src/main/java/com/todoroo/astrid/activity/MainActivity.java b/app/src/main/java/com/todoroo/astrid/activity/MainActivity.java
index 96f5e9607..f076609fa 100644
--- a/app/src/main/java/com/todoroo/astrid/activity/MainActivity.java
+++ b/app/src/main/java/com/todoroo/astrid/activity/MainActivity.java
@@ -412,9 +412,15 @@ public class MainActivity extends InjectingAppCompatActivity
       } else {
         taskEditFragment.discardButtonClick();
       }
-    } else if (!getTaskListFragment().collapseSearchView()) {
-      finish();
+      return;
     }
+
+    TaskListFragment taskListFragment = getTaskListFragment();
+    if (taskListFragment != null && taskListFragment.collapseSearchView()) {
+      return;
+    }
+
+    finish();
   }
 
   public TaskListFragment getTaskListFragment() {