diff --git a/RiotSwiftUI/Modules/Room/LocationSharing/View/LocationSharingView.swift b/RiotSwiftUI/Modules/Room/LocationSharing/View/LocationSharingView.swift
index ca13a80f91..0d40d14d99 100644
--- a/RiotSwiftUI/Modules/Room/LocationSharing/View/LocationSharingView.swift
+++ b/RiotSwiftUI/Modules/Room/LocationSharing/View/LocationSharingView.swift
@@ -66,6 +66,9 @@ struct LocationSharingView: View {
                     }
                 }
                 .navigationBarTitleDisplayMode(.inline)
+                .introspectNavigationController { navigationController in
+                    ThemeService.shared().theme.applyStyle(onNavigationBar: navigationController.navigationBar)
+                }
                 .ignoresSafeArea()
                 .alert(item: $context.alertInfo) { info in
                     if let secondaryButton = info.secondaryButton {
@@ -89,9 +92,6 @@ struct LocationSharingView: View {
         .accentColor(theme.colors.accent)
         .activityIndicator(show: context.viewState.showLoadingIndicator)
         .navigationViewStyle(StackNavigationViewStyle())
-        .introspectNavigationController { navigationController in
-            ThemeService.shared().theme.applyStyle(onNavigationBar: navigationController.navigationBar)
-        }
     }
     
     @ViewBuilder
diff --git a/RiotSwiftUI/Modules/Room/PollEditForm/View/PollEditForm.swift b/RiotSwiftUI/Modules/Room/PollEditForm/View/PollEditForm.swift
index 21bf5b1891..7ea9065937 100644
--- a/RiotSwiftUI/Modules/Room/PollEditForm/View/PollEditForm.swift
+++ b/RiotSwiftUI/Modules/Room/PollEditForm/View/PollEditForm.swift
@@ -116,14 +116,14 @@ struct PollEditForm: View {
                         }
                     }
                     .navigationBarTitleDisplayMode(.inline)
+                    .introspectNavigationController { navigationController in
+                        ThemeService.shared().theme.applyStyle(onNavigationBar: navigationController.navigationBar)
+                    }
                 }
             }
         }
         .accentColor(theme.colors.accent)
         .navigationViewStyle(StackNavigationViewStyle())
-        .introspectNavigationController { navigationController in
-            ThemeService.shared().theme.applyStyle(onNavigationBar: navigationController.navigationBar)
-        }
     }
 }
 
diff --git a/changelog.d/pr-5556.misc b/changelog.d/pr-5556.misc
new file mode 100644
index 0000000000..e69de29bb2