diff --git a/MPChartLib/build.gradle.kts b/MPChartLib/build.gradle.kts
index e74589e5ea..955f577eea 100644
--- a/MPChartLib/build.gradle.kts
+++ b/MPChartLib/build.gradle.kts
@@ -12,7 +12,7 @@ android {
     namespace = "com.github.mikephil.charting"
     defaultConfig {
         minSdk = 21
-        compileSdk = 35
+        compileSdk = 36
 
         // VERSION_NAME no longer available as of 4.1
         // https://issuetracker.google.com/issues/158695880
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 337f618831..271b4f18ab 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -12,8 +12,8 @@ android {
     defaultConfig {
         applicationId = "info.appdev.chartexample"
         minSdk = 21
-        compileSdk = 35
-        targetSdk = 35
+        compileSdk = 36
+        targetSdk = 36
         versionCode = getGitCommitCount()
         versionName = getVersionText()
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
diff --git a/app/src/main/java/info/appdev/chartexample/notimportant/DemoBase.kt b/app/src/main/java/info/appdev/chartexample/notimportant/DemoBase.kt
index 3cc7d87a4e..a8b0796a97 100644
--- a/app/src/main/java/info/appdev/chartexample/notimportant/DemoBase.kt
+++ b/app/src/main/java/info/appdev/chartexample/notimportant/DemoBase.kt
@@ -8,6 +8,7 @@ import android.view.Menu
 import android.view.MenuItem
 import android.view.View
 import android.widget.Toast
+import androidx.activity.OnBackPressedCallback
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.app.ActivityCompat
 import com.github.mikephil.charting.charts.Chart
@@ -39,6 +40,8 @@ abstract class DemoBase : AppCompatActivity(), ActivityCompat.OnRequestPermissio
 
         tfRegular = Typeface.createFromAsset(assets, "OpenSans-Regular.ttf")
         tfLight = Typeface.createFromAsset(assets, "OpenSans-Light.ttf")
+
+        onBackPressedDispatcher.addCallback(this, backPressedCallback)
     }
 
     override fun onPrepareOptionsMenu(menu: Menu?): Boolean {
@@ -51,9 +54,12 @@ abstract class DemoBase : AppCompatActivity(), ActivityCompat.OnRequestPermissio
         return super.onPrepareOptionsMenu(menu)
     }
 
-    override fun onBackPressed() {
-        super.onBackPressed()
-        overridePendingTransition(R.anim.move_left_in_activity, R.anim.move_right_out_activity)
+    private val backPressedCallback = object : OnBackPressedCallback(true) {
+        override fun handleOnBackPressed() {
+            overridePendingTransition(R.anim.move_left_in_activity, R.anim.move_right_out_activity)
+            isEnabled = false
+            onBackPressedDispatcher.onBackPressed()
+        }
     }
 
     override fun onRequestPermissionsResult(requestCode: Int, permissions: Array<String>, grantResults: IntArray) {