diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/activities/MainActivity.kt
index 7ef34ba2..5a4ad2f3 100644
--- a/app/src/main/kotlin/com/simplemobiletools/contacts/activities/MainActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/contacts/activities/MainActivity.kt
@@ -140,7 +140,6 @@ class MainActivity : SimpleActivity(), RefreshContactsListener {
 
     private fun setupTabColors() {
         val lastUsedPage = config.lastUsedViewPagerPage
-        viewpager.currentItem = lastUsedPage
         main_tabs_holder.apply {
             background = ColorDrawable(config.backgroundColor)
             setSelectedTabIndicatorColor(getAdjustedPrimaryColor())
@@ -160,6 +159,7 @@ class MainActivity : SimpleActivity(), RefreshContactsListener {
             favorites_fragment?.finishActMode()
             invalidateOptionsMenu()
         }
+        viewpager.currentItem = config.lastUsedViewPagerPage
 
         main_tabs_holder.onTabSelectionChanged(
                 tabUnselectedAction = {
diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/dialogs/AddFavoritesDialog.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/dialogs/AddFavoritesDialog.kt
index bdf5ed80..6dd5fc11 100644
--- a/app/src/main/kotlin/com/simplemobiletools/contacts/dialogs/AddFavoritesDialog.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/contacts/dialogs/AddFavoritesDialog.kt
@@ -25,7 +25,9 @@ class AddFavoritesDialog(val activity: SimpleActivity, val callback: () -> Unit)
             allContacts.sort()
 
             val contactSources = config.displayContactSources
-            allContacts = allContacts.filter { contactSources.contains(it.source) } as ArrayList<Contact>
+            if (!activity.config.showAllContacts()) {
+                allContacts = allContacts.filter { contactSources.contains(it.source) } as ArrayList<Contact>
+            }
             view.add_favorites_list.adapter = AddFavoritesAdapter(activity, allContacts, config.favorites)
 
             activity.runOnUiThread {