diff --git a/ElementX/Sources/Screens/LocationSharing/View/LocationSharingScreen.swift b/ElementX/Sources/Screens/LocationSharing/View/LocationSharingScreen.swift
index ed1ff2a28..2130698b3 100644
--- a/ElementX/Sources/Screens/LocationSharing/View/LocationSharingScreen.swift
+++ b/ElementX/Sources/Screens/LocationSharing/View/LocationSharingScreen.swift
@@ -25,6 +25,7 @@ struct LocationSharingScreen: View {
                 .sheet(isPresented: .constant(true)) {
                     StaticLocationSheet(context: context)
                         .alert(item: $context.alertInfo)
+                        .popover(isPresented: $context.showShareSheet) { shareSheet }
                 }
         }
     }
diff --git a/ElementX/Sources/Screens/LocationSharing/View/StaticLocationSheet.swift b/ElementX/Sources/Screens/LocationSharing/View/StaticLocationSheet.swift
index 9d8211bf0..839abd361 100644
--- a/ElementX/Sources/Screens/LocationSharing/View/StaticLocationSheet.swift
+++ b/ElementX/Sources/Screens/LocationSharing/View/StaticLocationSheet.swift
@@ -41,7 +41,6 @@ struct StaticLocationSheet: View {
                                      timestamp: location.timestamp,
                                      mediaProvider: context.mediaProvider)
                 }
-                accessibilityHint(L10n.actionShare)
             }
         }
     }
@@ -88,7 +87,7 @@ private struct UserLocationCell: View {
                 Spacer()
                 CompoundIcon(\.shareIos)
                     .foregroundStyle(.compound.iconSecondary)
-                    .accessibilityHidden(true)
+                    .accessibilityLabel(L10n.actionShare)
             }
             .padding(.vertical, 12)
             .rowDivider(alignment: .top)