diff --git a/app/src/main/java/org/thoughtcrime/securesms/ContactSelectionActivity.java b/app/src/main/java/org/thoughtcrime/securesms/ContactSelectionActivity.java
index dde0ca14d5..f3775cf939 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/ContactSelectionActivity.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/ContactSelectionActivity.java
@@ -170,7 +170,7 @@ public abstract class ContactSelectionActivity extends PassphraseRequiredActivit
       ContactSelectionActivity activity = this.activity.get();
 
       if (activity != null && !activity.isFinishing()) {
-        activity.contactsFragment.resetQueryFilter();
+        activity.contactsFragment.onDataRefreshed();
       }
     }
   }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/ContactSelectionListFragment.java b/app/src/main/java/org/thoughtcrime/securesms/ContactSelectionListFragment.java
index e6ba07b384..c246dc2f99 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/ContactSelectionListFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/ContactSelectionListFragment.java
@@ -556,9 +556,11 @@ public final class ContactSelectionListFragment extends LoggingFragment {
 
   public void resetQueryFilter() {
     setQueryFilter(null);
+    onDataRefreshed();
+  }
 
+  public void onDataRefreshed() {
     this.resetPositionOnCommit = true;
-
     swipeRefresh.setRefreshing(false);
   }