diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index b678662b..ab249e38 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -15,6 +15,7 @@
 	</queries>
 
 	<application
+		android:enableOnBackInvokedCallback="true"
 		android:icon="@mipmap/ic_launcher"
 		android:roundIcon="@mipmap/ic_launcher_round"
 		android:label="@string/app_name"
diff --git a/app/src/main/java/io/github/sspanak/tt9/preferences/PreferencesActivity.java b/app/src/main/java/io/github/sspanak/tt9/preferences/PreferencesActivity.java
index dc803e07..0504c9ed 100644
--- a/app/src/main/java/io/github/sspanak/tt9/preferences/PreferencesActivity.java
+++ b/app/src/main/java/io/github/sspanak/tt9/preferences/PreferencesActivity.java
@@ -3,6 +3,7 @@ package io.github.sspanak.tt9.preferences;
 import android.content.Intent;
 import android.os.Bundle;
 
+import androidx.activity.OnBackPressedCallback;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.ActionBar;
@@ -52,6 +53,7 @@ public class PreferencesActivity extends ActivityWithNavigation implements Prefe
 		validateFunctionKeys();
 
 		super.onCreate(savedInstanceState);
+		setOnBackPressed();
 
 		// changing the theme causes onCreate(), which displays the MainSettingsScreen,
 		// but leaves the old "back" history, which is no longer valid,
@@ -98,20 +100,26 @@ public class PreferencesActivity extends ActivityWithNavigation implements Prefe
 	}
 
 
-	@Override
-	public void onBackPressed() {
-		Fragment previousFragment = getSupportFragmentManager().findFragmentById(R.id.preferences_container);
-		if (previousFragment instanceof BaseScreenFragment) {
-			((BaseScreenFragment) previousFragment).onBackPressed();
-		}
+	/**
+	 * onBackPressed() is deprecated, so calling the onBackPressed() on the Fragments is now more complicated.
+	 */
+	private void setOnBackPressed() {
+		OnBackPressedCallback onBackPressedCallback = new OnBackPressedCallback(true) {
+			@Override
+			public void handleOnBackPressed() {
+				Fragment previousFragment = getSupportFragmentManager().findFragmentById(R.id.preferences_container);
+				if (previousFragment instanceof BaseScreenFragment) {
+					((BaseScreenFragment) previousFragment).onBackPressed();
+				}
 
-		super.onBackPressed();
+				setEnabled(false);
+				getOnBackPressedDispatcher().onBackPressed();
+				setEnabled(true);
+			}
+    };
 
-		Fragment nextFragment = getSupportFragmentManager().findFragmentById(R.id.preferences_container);
-		if (nextFragment instanceof BaseScreenFragment) {
-			((BaseScreenFragment) nextFragment).onBackPressed();
-			getOptionsCount = ((BaseScreenFragment) nextFragment)::getPreferenceCount;
-		}
+		// On API >= 33, this requires android:enableOnBackInvokedCallback="true" in the manifest
+		getOnBackPressedDispatcher().addCallback(this, onBackPressedCallback);
 	}
 
 
diff --git a/app/src/main/java/io/github/sspanak/tt9/preferences/screens/BaseScreenFragment.java b/app/src/main/java/io/github/sspanak/tt9/preferences/screens/BaseScreenFragment.java
index e32c4a83..642dc9cb 100644
--- a/app/src/main/java/io/github/sspanak/tt9/preferences/screens/BaseScreenFragment.java
+++ b/app/src/main/java/io/github/sspanak/tt9/preferences/screens/BaseScreenFragment.java
@@ -66,6 +66,7 @@ abstract public class BaseScreenFragment extends PreferenceFragmentCompat {
 	public void onResume() {
 		super.onResume();
 		setScreenTitle();
+		setActivityOptionCounter();
 	}
 
 
@@ -86,6 +87,13 @@ abstract public class BaseScreenFragment extends PreferenceFragmentCompat {
 	}
 
 
+	private void setActivityOptionCounter() {
+		if (activity != null) {
+			activity.setOptionsCount(this::getPreferenceCount);
+		}
+	}
+
+
 	public void resetFontSize(boolean reloadList) {
 		initPreferencesList();
 		preferencesList.getAll(reloadList, true);
diff --git a/app/src/main/java/io/github/sspanak/tt9/ui/ActivityWithNavigation.java b/app/src/main/java/io/github/sspanak/tt9/ui/ActivityWithNavigation.java
index 5282ff09..5961cbed 100644
--- a/app/src/main/java/io/github/sspanak/tt9/ui/ActivityWithNavigation.java
+++ b/app/src/main/java/io/github/sspanak/tt9/ui/ActivityWithNavigation.java
@@ -79,6 +79,11 @@ abstract public class ActivityWithNavigation extends EdgeToEdgeActivity {
 	}
 
 
+	public void setOptionsCount(@NonNull Callable<Integer> getOptionsCount) {
+		this.getOptionsCount = getOptionsCount;
+	}
+
+
 	protected void resetKeyRepeat() {
 		lastKey = KeyEvent.KEYCODE_UNKNOWN;
 	}