diff --git a/room-kit/src/main/java/live/hms/roomkit/ui/polls/PollQuestionViewHolder.kt b/room-kit/src/main/java/live/hms/roomkit/ui/polls/PollQuestionViewHolder.kt
index b15fb4734..b5ad97afb 100644
--- a/room-kit/src/main/java/live/hms/roomkit/ui/polls/PollQuestionViewHolder.kt
+++ b/room-kit/src/main/java/live/hms/roomkit/ui/polls/PollQuestionViewHolder.kt
@@ -89,12 +89,16 @@ class PollQuestionViewHolder<T : ViewBinding>(val binding: T,
             addAnOptionTextView.setOnSingleClickListener {
                 val showCheckBox = questionTypeSpinner.selectedItemPosition == 1
                 optionsAdapter.submitList(optionsAdapter.currentList.plus(Option("", showCheckBox)))
+                saveButton.isEnabled = true
             }
             deleteOptionTrashButton.setOnSingleClickListener {
                 // Delete the last option when delete is clicked.
                 optionsAdapter.submitList(optionsAdapter.currentList.dropLast(1))
+                saveButton.isEnabled = optionsAdapter.currentList.size > 1
             }
+            saveButton.isEnabled = false
             saveButton.setOnClickListener {
+                saveButton.isEnabled = false
                 val title = askAQuestionEditText.text.toString()
                 val newQuestionUi = when(questionTypeSpinner.selectedItemPosition){
                     // single, multi, short, long
diff --git a/room-kit/src/main/res/layout/layout_poll_question_creation_item.xml b/room-kit/src/main/res/layout/layout_poll_question_creation_item.xml
index 7d159da31..75281061a 100644
--- a/room-kit/src/main/res/layout/layout_poll_question_creation_item.xml
+++ b/room-kit/src/main/res/layout/layout_poll_question_creation_item.xml
@@ -132,7 +132,7 @@
             android:background="#475366"
             android:text="Save"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
             />
 
     </androidx.constraintlayout.widget.ConstraintLayout>