diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index c8431c51..a0ba2cca 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -12,6 +12,7 @@
 
     <application
         android:name=".SkylineApplication"
+        android:enableOnBackInvokedCallback="true"
         android:allowBackup="true"
         android:extractNativeLibs="true"
         android:fullBackupContent="@xml/backup_descriptor"
diff --git a/app/src/main/java/emu/skyline/EmulationActivity.kt b/app/src/main/java/emu/skyline/EmulationActivity.kt
index c0507a4d..1fce15cb 100644
--- a/app/src/main/java/emu/skyline/EmulationActivity.kt
+++ b/app/src/main/java/emu/skyline/EmulationActivity.kt
@@ -15,6 +15,7 @@ import android.os.*
 import android.util.Log
 import android.util.Rational
 import android.view.*
+import androidx.activity.OnBackPressedCallback
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.getSystemService
 import androidx.core.view.isGone
@@ -202,10 +203,6 @@ class EmulationActivity : AppCompatActivity(), SurfaceHolder.Callback, View.OnTo
         emulationThread!!.start()
     }
 
-    override fun onBackPressed() {
-        returnFromEmulation()
-    }
-
     @SuppressLint("SetTextI18n", "ClickableViewAccessibility")
     override fun onCreate(savedInstanceState : Bundle?) {
         super.onCreate(savedInstanceState)
@@ -287,6 +284,16 @@ class EmulationActivity : AppCompatActivity(), SurfaceHolder.Callback, View.OnTo
         changeAudioStatus(false)
     }
 
+    override fun onStart() {
+        super.onStart()
+
+        onBackPressedDispatcher.addCallback(object : OnBackPressedCallback(true) {
+            override fun handleOnBackPressed() {
+                returnFromEmulation()
+            }
+        })
+    }
+
     override fun onResume() {
         super.onResume()
 
diff --git a/app/src/main/java/emu/skyline/MainActivity.kt b/app/src/main/java/emu/skyline/MainActivity.kt
index 74a37e50..19ef8284 100644
--- a/app/src/main/java/emu/skyline/MainActivity.kt
+++ b/app/src/main/java/emu/skyline/MainActivity.kt
@@ -11,6 +11,7 @@ import android.net.Uri
 import android.os.Bundle
 import android.provider.DocumentsContract
 import android.view.View
+import androidx.activity.OnBackPressedCallback
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
@@ -308,6 +309,23 @@ class MainActivity : AppCompatActivity() {
         if (items.isEmpty()) adapter.setItems(listOf(HeaderViewItem(getString(R.string.no_rom))))
     }
 
+    override fun onStart() {
+        super.onStart()
+
+        onBackPressedDispatcher.addCallback(object : OnBackPressedCallback(true) {
+            override fun handleOnBackPressed() {
+                binding.searchBar.apply {
+                    if (hasFocus() && text.isNotEmpty()) {
+                        text = ""
+                        clearFocus()
+                    } else {
+                        finish()
+                    }
+                }
+            }
+        })
+    }
+
     override fun onResume() {
         super.onResume()
 
@@ -330,15 +348,4 @@ class MainActivity : AppCompatActivity() {
             adapter.notifyItemRangeChanged(0, adapter.currentItems.size)
         }
     }
-
-    override fun onBackPressed() {
-        binding.searchBar.apply {
-            if (hasFocus() && text.isNotEmpty()) {
-                text = ""
-                clearFocus()
-            } else {
-                super.onBackPressed()
-            }
-        }
-    }
 }
diff --git a/app/src/main/java/emu/skyline/SettingsActivity.kt b/app/src/main/java/emu/skyline/SettingsActivity.kt
index 4c1bac03..1900f097 100644
--- a/app/src/main/java/emu/skyline/SettingsActivity.kt
+++ b/app/src/main/java/emu/skyline/SettingsActivity.kt
@@ -145,7 +145,7 @@ class SettingsActivity : AppCompatActivity() {
      */
     override fun onKeyUp(keyCode : Int, event : KeyEvent?) : Boolean {
         if (keyCode == KeyEvent.KEYCODE_BUTTON_B) {
-            onBackPressed()
+            onBackPressedDispatcher.onBackPressed()
             return true
         }
 
diff --git a/app/src/main/java/emu/skyline/input/ControllerActivity.kt b/app/src/main/java/emu/skyline/input/ControllerActivity.kt
index 233cd26c..09e48b81 100644
--- a/app/src/main/java/emu/skyline/input/ControllerActivity.kt
+++ b/app/src/main/java/emu/skyline/input/ControllerActivity.kt
@@ -342,7 +342,7 @@ class ControllerActivity : AppCompatActivity() {
      */
     override fun onKeyUp(keyCode : Int, event : KeyEvent?) : Boolean {
         if (keyCode == KeyEvent.KEYCODE_BUTTON_B) {
-            onBackPressed()
+            onBackPressedDispatcher.onBackPressed()
             return true
         }