diff --git a/src/org/thoughtcrime/securesms/ConversationListFragment.java b/src/org/thoughtcrime/securesms/ConversationListFragment.java
index 23953f1508..f1168e1d55 100644
--- a/src/org/thoughtcrime/securesms/ConversationListFragment.java
+++ b/src/org/thoughtcrime/securesms/ConversationListFragment.java
@@ -112,9 +112,12 @@ public class ConversationListFragment extends SherlockListFragment
     searchView.setOnQueryTextListener(new SearchView.OnQueryTextListener() {
       @Override
       public boolean onQueryTextSubmit(String query) {
-        ConversationListFragment.this.queryFilter = query;
-        ConversationListFragment.this.getLoaderManager().restartLoader(0, null, ConversationListFragment.this);
-        return true;
+        if (isAdded()) {
+          ConversationListFragment.this.queryFilter = query;
+          ConversationListFragment.this.getLoaderManager().restartLoader(0, null, ConversationListFragment.this);
+          return true;
+        }
+        return false;
       }
       @Override
       public boolean onQueryTextChange(String newText) {