diff --git a/projects/stream-chat-angular/src/lib/polls/poll-composer/poll-composer.component.html b/projects/stream-chat-angular/src/lib/polls/poll-composer/poll-composer.component.html
index 887bb351..e134db39 100644
--- a/projects/stream-chat-angular/src/lib/polls/poll-composer/poll-composer.component.html
+++ b/projects/stream-chat-angular/src/lib/polls/poll-composer/poll-composer.component.html
@@ -87,14 +87,18 @@
                 <!-- eslint-enable @angular-eslint/template/use-track-by-function -->
                 <div class="str-chat__drag-and-drop-container__item">
                   <div class="str-chat__form__input-field">
-                    <input
-                      id="option{{ i }}"
-                      name="option{{ i }}"
-                      type="text"
-                      [formControl]="option"
-                      (input)="optionChanged(i)"
-                      placeholder="{{ 'streamChat.Add an option' | translate }}"
-                    />
+                    <div class="str-chat__form__input-field__value">
+                      <input
+                        id="option{{ i }}"
+                        name="option{{ i }}"
+                        type="text"
+                        [formControl]="option"
+                        (input)="optionChanged(i)"
+                        placeholder="{{
+                          'streamChat.Add an option' | translate
+                        }}"
+                      />
+                    </div>
                   </div>
                 </div>
               </ng-container>
diff --git a/projects/stream-chat-angular/src/lib/polls/poll-composer/poll-composer.component.ts b/projects/stream-chat-angular/src/lib/polls/poll-composer/poll-composer.component.ts
index c608a471..f7bd24ef 100644
--- a/projects/stream-chat-angular/src/lib/polls/poll-composer/poll-composer.component.ts
+++ b/projects/stream-chat-angular/src/lib/polls/poll-composer/poll-composer.component.ts
@@ -79,7 +79,7 @@ export class PollComposerComponent {
   optionChanged(index: number) {
     const control = this.options.at(index);
     const penultimateIndex = this.options.length - 2;
-    if (index === this.options.length - 1 && control.value?.length === 1) {
+    if (index === this.options.length - 1) {
       this.addOption();
     } else if (
       index === penultimateIndex &&