diff --git a/app/lib/core/providers/app_state.dart b/app/lib/core/providers/app_state.dart
new file mode 100644
index 00000000..2cc07b19
--- /dev/null
+++ b/app/lib/core/providers/app_state.dart
@@ -0,0 +1,16 @@
+import 'package:flutter/widgets.dart';
+import 'package:riverpod_annotation/riverpod_annotation.dart';
+
+part 'app_state.g.dart';
+
+@Riverpod(keepAlive: true)
+class AppStateKey extends _$AppStateKey {
+  void reset() {
+    state = GlobalKey(debugLabel: 'RootKey');
+  }
+
+  @override
+  GlobalKey build() {
+    return GlobalKey(debugLabel: 'RootKey');
+  }
+}
diff --git a/app/lib/core/providers/app_state.g.dart b/app/lib/core/providers/app_state.g.dart
new file mode 100644
index 00000000..2dd735ac
--- /dev/null
+++ b/app/lib/core/providers/app_state.g.dart
@@ -0,0 +1,74 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'app_state.dart';
+
+// **************************************************************************
+// RiverpodGenerator
+// **************************************************************************
+
+// GENERATED CODE - DO NOT MODIFY BY HAND
+// ignore_for_file: type=lint, type=warning
+
+@ProviderFor(AppStateKey)
+const appStateKeyProvider = AppStateKeyProvider._();
+
+final class AppStateKeyProvider
+    extends $NotifierProvider<AppStateKey, GlobalKey<State<StatefulWidget>>> {
+  const AppStateKeyProvider._()
+    : super(
+        from: null,
+        argument: null,
+        retry: null,
+        name: r'appStateKeyProvider',
+        isAutoDispose: false,
+        dependencies: null,
+        $allTransitiveDependencies: null,
+      );
+
+  @override
+  String debugGetCreateSourceHash() => _$appStateKeyHash();
+
+  @$internal
+  @override
+  AppStateKey create() => AppStateKey();
+
+  /// {@macro riverpod.override_with_value}
+  Override overrideWithValue(GlobalKey<State<StatefulWidget>> value) {
+    return $ProviderOverride(
+      origin: this,
+      providerOverride: $SyncValueProvider<GlobalKey<State<StatefulWidget>>>(
+        value,
+      ),
+    );
+  }
+}
+
+String _$appStateKeyHash() => r'113c208139d84cdd52f623c2c6298b430fc1a889';
+
+abstract class _$AppStateKey
+    extends $Notifier<GlobalKey<State<StatefulWidget>>> {
+  GlobalKey<State<StatefulWidget>> build();
+  @$mustCallSuper
+  @override
+  void runBuild() {
+    final created = build();
+    final ref =
+        this.ref
+            as $Ref<
+              GlobalKey<State<StatefulWidget>>,
+              GlobalKey<State<StatefulWidget>>
+            >;
+    final element =
+        ref.element
+            as $ClassProviderElement<
+              AnyNotifier<
+                GlobalKey<State<StatefulWidget>>,
+                GlobalKey<State<StatefulWidget>>
+              >,
+              GlobalKey<State<StatefulWidget>>,
+              Object?,
+              Object?
+            >;
+    element.handleValue(ref, created);
+  }
+}
diff --git a/app/lib/core/providers/router.dart b/app/lib/core/providers/router.dart
index 97ef1e8a..b6d23ed6 100644
--- a/app/lib/core/providers/router.dart
+++ b/app/lib/core/providers/router.dart
@@ -19,6 +19,7 @@
  */
 import 'package:go_router/go_router.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
+import 'package:weblibre/core/providers/app_state.dart';
 import 'package:weblibre/core/routing/routes.dart';
 import 'package:weblibre/features/user/domain/repositories/onboarding.dart';
 
@@ -26,6 +27,8 @@ part 'router.g.dart';
 
 @Riverpod(keepAlive: true)
 Future<GoRouter> router(Ref ref) async {
+  ref.watch(appStateKeyProvider); //Rebuild router on key changes
+
   final onboardingRepository = ref.read(onboardingRepositoryProvider.notifier);
 
   String? initialLocation;
diff --git a/app/lib/core/providers/router.g.dart b/app/lib/core/providers/router.g.dart
index f849f572..ec9a59b9 100644
--- a/app/lib/core/providers/router.g.dart
+++ b/app/lib/core/providers/router.g.dart
@@ -41,4 +41,4 @@ final class RouterProvider
   }
 }
 
-String _$routerHash() => r'9e7ab621a0e97d0aab2c6bd1fd0e272d81e5298c';
+String _$routerHash() => r'87b6e6c1097a0677f3d25570341b343b4392aa59';
diff --git a/app/lib/features/settings/presentation/screens/developer_settings.dart b/app/lib/features/settings/presentation/screens/developer_settings.dart
index 56e47984..7a7b57e4 100644
--- a/app/lib/features/settings/presentation/screens/developer_settings.dart
+++ b/app/lib/features/settings/presentation/screens/developer_settings.dart
@@ -29,6 +29,7 @@ import 'package:go_router/go_router.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:universal_io/io.dart';
 import 'package:weblibre/core/logger.dart';
+import 'package:weblibre/core/providers/app_state.dart';
 import 'package:weblibre/core/routing/routes.dart';
 import 'package:weblibre/features/settings/presentation/controllers/save_settings.dart';
 import 'package:weblibre/features/settings/presentation/widgets/custom_list_tile.dart';
@@ -222,6 +223,25 @@ class DeveloperSettingsScreen extends HookConsumerWidget {
                   await AddonCollectionRoute().push(context);
                 },
               ),
+              CustomListTile(
+                title: 'Reset UI',
+                subtitle: 'Rebuild the entire app UI',
+                prefix: Padding(
+                  padding: const EdgeInsets.only(right: 16.0),
+                  child: Icon(
+                    Icons.bug_report,
+                    size: 24,
+                    color: Theme.of(context).colorScheme.onSurfaceVariant,
+                  ),
+                ),
+                suffix: FilledButton.icon(
+                  onPressed: () {
+                    ref.read(appStateKeyProvider.notifier).reset();
+                  },
+                  icon: const Icon(Icons.restore),
+                  label: const Text('Reset'),
+                ),
+              ),
             ],
           );
         },
diff --git a/app/lib/main.dart b/app/lib/main.dart
index 5267409b..ab98b723 100644
--- a/app/lib/main.dart
+++ b/app/lib/main.dart
@@ -30,6 +30,7 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:logger/logger.dart';
 import 'package:weblibre/core/error_observer.dart';
 import 'package:weblibre/core/logger.dart';
+import 'package:weblibre/core/providers/app_state.dart';
 import 'package:weblibre/core/providers/defaults.dart';
 import 'package:weblibre/domain/services/app_initialization.dart';
 import 'package:weblibre/features/user/domain/repositories/engine_settings.dart';
@@ -77,6 +78,8 @@ void main() async {
       observers: const [ErrorObserver()],
       child: HookConsumer(
         builder: (context, ref, child) {
+          final rootKey = ref.watch(appStateKeyProvider);
+
           final themeMode = ref.watch(
             generalSettingsWithDefaultsProvider.select(
               (value) => value.themeMode,
@@ -146,6 +149,7 @@ void main() async {
               }
 
               return MainApp(
+                key: rootKey,
                 theme: ThemeData(
                   useMaterial3: true,
                   colorScheme: lightColorScheme,