diff --git a/components/Blocks/BlockCommands.tsx b/components/Blocks/BlockCommands.tsx
index 4aae329d..b7abb5a5 100644
--- a/components/Blocks/BlockCommands.tsx
+++ b/components/Blocks/BlockCommands.tsx
@@ -24,6 +24,7 @@ import { keepFocus } from "components/Toolbar/TextBlockTypeToolbar";
 import { useEditorStates } from "src/state/useEditorState";
 import { elementId } from "src/utils/elementId";
 import { usePollBlockUIState } from "./PollBlock";
+import { focusElement } from "components/Input";
 
 type Props = {
   parent: string;
@@ -212,9 +213,10 @@ export const blockCommands: Command[] = [
     type: "block",
     onSelect: async (rep, props) => {
       let entity = await createBlockWithType(rep, props, "poll");
+      let pollOptionEntity = v7();
       await rep.mutate.addPollOption({
         pollEntity: entity,
-        pollOptionEntity: v7(),
+        pollOptionEntity,
         pollOptionName: "",
         factID: v7(),
         permission_set: props.entity_set,
@@ -227,6 +229,13 @@ export const blockCommands: Command[] = [
         permission_set: props.entity_set,
       });
       usePollBlockUIState.setState((s) => ({ [entity]: { state: "editing" } }));
+      setTimeout(() => {
+        focusElement(
+          document.getElementById(
+            elementId.block(entity).pollInput(pollOptionEntity),
+          ) as HTMLInputElement | null,
+        );
+      }, 20);
     },
   },
 
diff --git a/components/Blocks/PollBlock.tsx b/components/Blocks/PollBlock.tsx
index a5ccf4c7..86e55eeb 100644
--- a/components/Blocks/PollBlock.tsx
+++ b/components/Blocks/PollBlock.tsx
@@ -2,7 +2,7 @@ import { useUIState } from "src/useUIState";
 import { BlockProps } from "./Block";
 import { ButtonPrimary, ButtonSecondary } from "components/Buttons";
 import { useCallback, useEffect, useState } from "react";
-import { Input } from "components/Input";
+import { focusElement, Input } from "components/Input";
 import { CheckTiny, CloseTiny, InfoSmall } from "components/Icons";
 import { Separator } from "components/Layout";
 import { useEntitySetContext } from "components/EntitySetProvider";
@@ -13,6 +13,7 @@ import { usePollData } from "components/PageSWRDataProvider";
 import { voteOnPoll } from "actions/pollActions";
 import { create } from "zustand";
 import { poll_votes_on_entity } from "drizzle/schema";
+import { elementId } from "src/utils/elementId";
 
 export let usePollBlockUIState = create(
   () =>
@@ -316,14 +317,21 @@ const EditPoll = (props: {
 
       <button
         className="pollAddOption w-fit flex gap-2 items-center justify-start text-sm text-accent-contrast"
-        onClick={() => {
-          rep?.mutate.addPollOption({
+        onClick={async () => {
+          let pollOptionEntity = v7();
+          await rep?.mutate.addPollOption({
             pollEntity: props.entityID,
-            pollOptionEntity: v7(),
+            pollOptionEntity,
             pollOptionName: "",
             permission_set: permission_set.set,
             factID: v7(),
           });
+
+          focusElement(
+            document.getElementById(
+              elementId.block(props.entityID).pollInput(pollOptionEntity),
+            ) as HTMLInputElement | null,
+          );
         }}
       >
         Add an Option
@@ -386,6 +394,7 @@ const EditPollOption = (props: {
   return (
     <div className="flex gap-2 items-center">
       <Input
+        id={elementId.block(props.pollEntity).pollInput(props.entityID)}
         type="text"
         className="pollOptionInput w-full input-with-border"
         placeholder="Option here..."
diff --git a/components/Input.tsx b/components/Input.tsx
index 5060225b..80f42f48 100644
--- a/components/Input.tsx
+++ b/components/Input.tsx
@@ -12,32 +12,7 @@ export function Input(
   useEffect(() => {
     if (!isIOS()) return;
     if (props.autoFocus) {
-      let fakeInput = document.createElement("input");
-      fakeInput.setAttribute("type", "text");
-      fakeInput.style.position = "fixed";
-      fakeInput.style.height = "0px";
-      fakeInput.style.width = "0px";
-      fakeInput.style.fontSize = "16px"; // disable auto zoom
-      document.body.appendChild(fakeInput);
-      fakeInput.focus();
-      setTimeout(() => {
-        if (!ref.current) return;
-        ref.current.style.transform = "translateY(-2000px)";
-        ref.current?.focus();
-        fakeInput.remove();
-        ref.current.value = " ";
-        ref.current.setSelectionRange(1, 1);
-        requestAnimationFrame(() => {
-          if (ref.current) {
-            ref.current.style.transform = "";
-          }
-        });
-        setTimeout(() => {
-          if (!ref.current) return;
-          ref.current.value = "";
-          ref.current.setSelectionRange(0, 0);
-        }, 50);
-      }, 20);
+      focusElement(ref.current);
     }
   }, [props.autoFocus]);
 
@@ -51,6 +26,40 @@ export function Input(
   );
 }
 
+export const focusElement = (el?: HTMLInputElement | null) => {
+  if (!isIOS()) {
+    el?.focus();
+    return;
+  }
+
+  let fakeInput = document.createElement("input");
+  fakeInput.setAttribute("type", "text");
+  fakeInput.style.position = "fixed";
+  fakeInput.style.height = "0px";
+  fakeInput.style.width = "0px";
+  fakeInput.style.fontSize = "16px"; // disable auto zoom
+  document.body.appendChild(fakeInput);
+  fakeInput.focus();
+  setTimeout(() => {
+    if (!el) return;
+    el.style.transform = "translateY(-2000px)";
+    el?.focus();
+    fakeInput.remove();
+    el.value = " ";
+    el.setSelectionRange(1, 1);
+    requestAnimationFrame(() => {
+      if (el) {
+        el.style.transform = "";
+      }
+    });
+    setTimeout(() => {
+      if (!el) return;
+      el.value = "";
+      el.setSelectionRange(0, 0);
+    }, 50);
+  }, 20);
+};
+
 export const InputWithLabel = (
   props: {
     label: string;