diff --git a/app/src/main/java/com/keylesspalace/tusky/adapter/AccountFieldEditAdapter.kt b/app/src/main/java/com/keylesspalace/tusky/adapter/AccountFieldEditAdapter.kt
index 96774ac0..a57c0aba 100644
--- a/app/src/main/java/com/keylesspalace/tusky/adapter/AccountFieldEditAdapter.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/adapter/AccountFieldEditAdapter.kt
@@ -82,11 +82,11 @@ class AccountFieldEditAdapter : RecyclerView.Adapter<BindingHolder<ItemEditField
         }
 
         holder.binding.accountFieldNameText.doAfterTextChanged { newText ->
-            fieldData[holder.bindingAdapterPosition].first = newText.toString()
+            fieldData.getOrNull(holder.bindingAdapterPosition)?.first = newText.toString()
         }
 
         holder.binding.accountFieldValueText.doAfterTextChanged { newText ->
-            fieldData[holder.bindingAdapterPosition].second = newText.toString()
+            fieldData.getOrNull(holder.bindingAdapterPosition)?.second = newText.toString()
         }
 
         // Ensure the textview contents are selectable