diff --git a/lib/widgets/collection/entry_set_action_delegate.dart b/lib/widgets/collection/entry_set_action_delegate.dart
index a71908c84..3abf41f8c 100644
--- a/lib/widgets/collection/entry_set_action_delegate.dart
+++ b/lib/widgets/collection/entry_set_action_delegate.dart
@@ -556,15 +556,16 @@ class EntrySetActionDelegate with FeedbackMixin, PermissionAwareMixin, SizeAware
   }
 
   Future<void> removeLocation(BuildContext context, Set<AvesEntry> entries) async {
+    final l10n = context.l10n;
     final confirmed = await showDialog<bool>(
       context: context,
       builder: (context) => AvesDialog(
-        content: Text(context.l10n.genericDangerWarningDialogMessage),
+        content: Text(l10n.genericDangerWarningDialogMessage),
         actions: [
           const CancelButton(),
           TextButton(
             onPressed: () => Navigator.maybeOf(context)?.pop(true),
-            child: Text(context.l10n.applyButtonLabel),
+            child: Text(l10n.applyButtonLabel),
           ),
         ],
       ),
diff --git a/lib/widgets/settings/settings_definition.dart b/lib/widgets/settings/settings_definition.dart
index e0f7b7724..3548e86cc 100644
--- a/lib/widgets/settings/settings_definition.dart
+++ b/lib/widgets/settings/settings_definition.dart
@@ -12,10 +12,10 @@ abstract class SettingsSection {
 
   FutureOr<List<SettingsTile>> tiles(BuildContext context);
 
-  Widget build(BuildContext context, ValueNotifier<String?> expandedNotifier) {
+  Widget build(BuildContext sectionContext, ValueNotifier<String?> expandedNotifier) {
     return FutureBuilder<List<SettingsTile>>(
-      future: Future.value(tiles(context)),
-      builder: (context, snapshot) {
+      future: Future.value(tiles(sectionContext)),
+      builder: (tileContext, snapshot) {
         final tiles = snapshot.data;
         if (tiles == null) return const SizedBox();
 
@@ -25,11 +25,12 @@ abstract class SettingsSection {
           // use a fixed value instead of the title to identify this expansion tile
           // so that the tile state is kept when the language is modified
           value: key,
-          leading: icon(context),
-          title: title(context),
+          leading: icon(tileContext),
+          title: title(tileContext),
           expandedNotifier: expandedNotifier,
           showHighlight: false,
-          children: tiles.map((v) => v.build(context)).toList(),
+          // reuse section context so that dialogs opened from tiles have the right text theme
+          children: tiles.map((v) => v.build(sectionContext)).toList(),
         );
       },
     );