diff --git a/lib/ui/views/app_selector/app_selector_viewmodel.dart b/lib/ui/views/app_selector/app_selector_viewmodel.dart
index 46c3eabf3a..7961ceb9ed 100644
--- a/lib/ui/views/app_selector/app_selector_viewmodel.dart
+++ b/lib/ui/views/app_selector/app_selector_viewmodel.dart
@@ -197,7 +197,7 @@ class AppSelectorViewModel extends BaseViewModel {
   Future showSelectFromStorageDialog(BuildContext context) async {
     return showDialog(
       context: context,
-      builder: (context) => SimpleDialog(
+      builder: (innerContext) => SimpleDialog(
         alignment: Alignment.center,
         contentPadding:
             const EdgeInsets.symmetric(horizontal: 20, vertical: 20),
@@ -206,7 +206,7 @@ class AppSelectorViewModel extends BaseViewModel {
           Icon(
             Icons.block,
             size: 28,
-            color: Theme.of(context).colorScheme.primary,
+            color: Theme.of(innerContext).colorScheme.primary,
           ),
           const SizedBox(height: 20),
           I18nText(
@@ -234,7 +234,7 @@ class AppSelectorViewModel extends BaseViewModel {
           const SizedBox(height: 30),
           CustomMaterialButton(
             onPressed: () async {
-              Navigator.pop(context);
+              Navigator.pop(innerContext);
               await selectAppFromStorage(context);
             },
             label: Row(
@@ -250,7 +250,7 @@ class AppSelectorViewModel extends BaseViewModel {
           CustomMaterialButton(
             isFilled: false,
             onPressed: () {
-              Navigator.pop(context);
+              Navigator.pop(innerContext);
             },
             label: Row(
               mainAxisAlignment: MainAxisAlignment.center,