diff --git a/ElementX/Sources/Screens/CreatePollScreen/View/PollFormScreen.swift b/ElementX/Sources/Screens/CreatePollScreen/View/PollFormScreen.swift
index b489b09e8..54a4a6db3 100644
--- a/ElementX/Sources/Screens/CreatePollScreen/View/PollFormScreen.swift
+++ b/ElementX/Sources/Screens/CreatePollScreen/View/PollFormScreen.swift
@@ -53,10 +53,6 @@ struct PollFormScreen: View {
                     kind: .textField(text: $context.question, axis: .vertical))
                 .focused($focus, equals: .question)
                 .accessibilityIdentifier(A11yIdentifiers.pollFormScreen.question)
-                .onSubmit {
-                    focus = context.options.indices.first.map { .option(index: $0) }
-                }
-                .submitLabel(.next)
         } header: {
             Text(L10n.screenCreatePollQuestionDesc)
                 .compoundListSectionHeader()
diff --git a/ElementX/Sources/Screens/HomeScreen/HomeScreenCoordinator.swift b/ElementX/Sources/Screens/HomeScreen/HomeScreenCoordinator.swift
index 0336f2866..98bc3b03e 100644
--- a/ElementX/Sources/Screens/HomeScreen/HomeScreenCoordinator.swift
+++ b/ElementX/Sources/Screens/HomeScreen/HomeScreenCoordinator.swift
@@ -40,6 +40,8 @@ enum HomeScreenCoordinatorAction {
 
 final class HomeScreenCoordinator: CoordinatorProtocol {
     private var viewModel: HomeScreenViewModelProtocol
+    // periphery:ignore - only used in release builds
+    private let bugReportService: BugReportServiceProtocol
     
     private let actionsSubject: PassthroughSubject<HomeScreenCoordinatorAction, Never> = .init()
     private var cancellables = Set<AnyCancellable>()
@@ -53,6 +55,7 @@ final class HomeScreenCoordinator: CoordinatorProtocol {
                                         selectedRoomPublisher: parameters.selectedRoomPublisher,
                                         appSettings: ServiceLocator.shared.settings,
                                         userIndicatorController: ServiceLocator.shared.userIndicatorController)
+        bugReportService = parameters.bugReportService
         
         viewModel.actions
             .sink { [weak self] action in
@@ -88,7 +91,7 @@ final class HomeScreenCoordinator: CoordinatorProtocol {
     
     func start() {
         #if !DEBUG
-        if parameters.bugReportService.crashedLastRun {
+        if bugReportService.crashedLastRun {
             viewModel.presentCrashedLastRunAlert()
         }
         #endif
diff --git a/UITests/Sources/PollFormScreenUITests.swift b/UITests/Sources/PollFormScreenUITests.swift
index 2303abf70..0db6dc1be 100644
--- a/UITests/Sources/PollFormScreenUITests.swift
+++ b/UITests/Sources/PollFormScreenUITests.swift
@@ -25,8 +25,8 @@ class PollFormScreenUITests: XCTestCase {
 
     func testFilledPoll() async throws {
         let app = Application.launch(.createPoll)
-        let questionTextField = app.textFields[A11yIdentifiers.pollFormScreen.question]
-        questionTextField.tap()
+        let questionTextField = app.textViews[A11yIdentifiers.pollFormScreen.question]
+        questionTextField.coordinate(withNormalizedOffset: .init(dx: 0.5, dy: 0.5)).tap() // Tap isn't registered without the offset.
         questionTextField.typeText("Do you like polls?")
 
         let option1TextField = app.textFields[A11yIdentifiers.pollFormScreen.optionID(0)]
@@ -54,12 +54,9 @@ class PollFormScreenUITests: XCTestCase {
                 app.swipeUp()
             }
             addOption.tap()
+            app.typeText("\n") // Dismiss the keyboard so the Add button is always visible.
         }
-
-        if app.keyboards.count > 0 {
-            app.typeText("\n")
-        }
-        app.swipeUp() // Dismisses the keyboard.
+        
         app.swipeUp() // Ensures that the bottom is shown.
         
         XCTAssertFalse(addOption.exists)