diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 1069bb9..a548855 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -2,7 +2,8 @@
     <application
         android:label="Ollama"
         android:name="${applicationName}"
-        android:icon="@mipmap/ic_launcher">
+        android:icon="@mipmap/ic_launcher"
+        android:enableOnBackInvokedCallback="true">
         <activity
             android:name=".MainActivity"
             android:exported="true"
diff --git a/lib/worker/theme.dart b/lib/worker/theme.dart
index c82d0f7..f7f04b2 100644
--- a/lib/worker/theme.dart
+++ b/lib/worker/theme.dart
@@ -54,10 +54,19 @@ void resetSystemNavigation(BuildContext context,
   });
 }
 
+ThemeData themeModifier(ThemeData theme) {
+  return theme.copyWith(
+      pageTransitionsTheme: const PageTransitionsTheme(
+    builders: <TargetPlatform, PageTransitionsBuilder>{
+      TargetPlatform.android: PredictiveBackPageTransitionsBuilder(),
+    },
+  ));
+}
+
 ThemeData themeLight() {
   if (!(prefs?.getBool("useDeviceTheme") ?? false) ||
       colorSchemeLight == null) {
-    return ThemeData.from(
+    return themeModifier(ThemeData.from(
         colorScheme: const ColorScheme(
             brightness: Brightness.light,
             primary: Colors.black,
@@ -67,15 +76,15 @@ ThemeData themeLight() {
             error: Colors.red,
             onError: Colors.white,
             surface: Colors.white,
-            onSurface: Colors.black));
+            onSurface: Colors.black)));
   } else {
-    return ThemeData.from(colorScheme: colorSchemeLight!);
+    return themeModifier(ThemeData.from(colorScheme: colorSchemeLight!));
   }
 }
 
 ThemeData themeDark() {
   if (!(prefs?.getBool("useDeviceTheme") ?? false) || colorSchemeDark == null) {
-    return ThemeData.from(
+    return themeModifier(ThemeData.from(
         colorScheme: const ColorScheme(
             brightness: Brightness.dark,
             primary: Colors.white,
@@ -85,9 +94,9 @@ ThemeData themeDark() {
             error: Colors.red,
             onError: Colors.black,
             surface: Colors.black,
-            onSurface: Colors.white));
+            onSurface: Colors.white)));
   } else {
-    return ThemeData.from(colorScheme: colorSchemeDark!);
+    return themeModifier(ThemeData.from(colorScheme: colorSchemeDark!));
   }
 }