diff --git a/app/src/main/java/org/thoughtcrime/securesms/avatar/picker/AvatarPickerFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/avatar/picker/AvatarPickerFragment.kt
index 7d8686e42b..1a4ffb244b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/avatar/picker/AvatarPickerFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/avatar/picker/AvatarPickerFragment.kt
@@ -93,6 +93,8 @@ class AvatarPickerFragment : Fragment(R.layout.avatar_picker_fragment) {
       adapter.submitList(items) {
         if (selectedPosition > -1) {
           recycler.smoothScrollToPosition(selectedPosition)
+        } else {
+          recycler.smoothScrollToPosition(0)
         }
       }
     }