diff --git a/app/soapbox/features/compose/components/poll-form.tsx b/app/soapbox/features/compose/components/polls/poll-form.tsx
similarity index 98%
rename from app/soapbox/features/compose/components/poll-form.tsx
rename to app/soapbox/features/compose/components/polls/poll-form.tsx
index 06d178518..18e096e8e 100644
--- a/app/soapbox/features/compose/components/poll-form.tsx
+++ b/app/soapbox/features/compose/components/polls/poll-form.tsx
@@ -7,7 +7,7 @@ import AutosuggestInput from 'soapbox/components/autosuggest_input';
 import { Button, Divider, HStack, Stack, Text, Toggle } from 'soapbox/components/ui';
 import { useAppSelector } from 'soapbox/hooks';
 
-import DurationSelector from './polls/duration-selector';
+import DurationSelector from './duration-selector';
 
 import type { AutoSuggestion } from 'soapbox/components/autosuggest_input';
 
@@ -94,7 +94,7 @@ const Option = (props: IOption) => {
           onSuggestionsClearRequested={onSuggestionsClearRequested}
           onSuggestionSelected={onSuggestionSelected}
           searchTokens={[':']}
-          autoFocus={index === 0}
+          autoFocus={index === 0 || index >= 2}
         />
       </HStack>
 
diff --git a/app/soapbox/features/compose/containers/poll_form_container.js b/app/soapbox/features/compose/containers/poll_form_container.js
index 04c3b61ee..c6bae9f84 100644
--- a/app/soapbox/features/compose/containers/poll_form_container.js
+++ b/app/soapbox/features/compose/containers/poll_form_container.js
@@ -10,7 +10,7 @@ import {
   fetchComposeSuggestions,
   selectComposeSuggestion,
 } from '../../../actions/compose';
-import PollForm from '../components/poll-form';
+import PollForm from '../components/polls/poll-form';
 
 const mapStateToProps = state => ({
   suggestions: state.getIn(['compose', 'suggestions']),