diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewPostView.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewPostView.kt
index b8f4019b9..de0529f4a 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewPostView.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewPostView.kt
@@ -629,17 +629,21 @@ private fun BottomRowActions(postViewModel: NewPostViewModel) {
 
 @Composable
 private fun PollField(postViewModel: NewPostViewModel) {
+    val optionsList = postViewModel.pollOptions
     Column(
         modifier = Modifier.fillMaxWidth(),
     ) {
-        postViewModel.pollOptions.values.forEachIndexed { index, _ ->
-            NewPollOption(postViewModel, index)
+        optionsList.forEach { value ->
+            NewPollOption(postViewModel, value.key)
         }
 
         NewPollVoteValueRange(postViewModel)
 
         Button(
-            onClick = { postViewModel.pollOptions[postViewModel.pollOptions.size] = "" },
+            onClick = {
+                // postViewModel.pollOptions[postViewModel.pollOptions.size] = ""
+                optionsList[optionsList.size] = ""
+            },
             border =
                 BorderStroke(
                     1.dp,