diff --git a/app/src/main/java/com/owenlejeune/tvtime/OnboardingActivity.kt b/app/src/main/java/com/owenlejeune/tvtime/OnboardingActivity.kt
index c52fb18..cfa424e 100644
--- a/app/src/main/java/com/owenlejeune/tvtime/OnboardingActivity.kt
+++ b/app/src/main/java/com/owenlejeune/tvtime/OnboardingActivity.kt
@@ -1,6 +1,9 @@
 package com.owenlejeune.tvtime
 
+import android.annotation.SuppressLint
 import android.os.Bundle
+import android.window.OnBackInvokedDispatcher
+import androidx.activity.OnBackPressedCallback
 import androidx.activity.compose.setContent
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
@@ -21,6 +24,7 @@ import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
+import androidx.core.os.BuildCompat
 import androidx.lifecycle.lifecycleScope
 import com.google.accompanist.pager.*
 import com.google.accompanist.systemuicontroller.rememberSystemUiController
@@ -41,6 +45,7 @@ class OnboardingActivity: MonetCompatActivity() {
     private lateinit var pagerState: PagerState
     private lateinit var coroutineScope: CoroutineScope
 
+    @SuppressLint("UnsafeOptInUsageError")
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         lifecycleScope.launchWhenCreated {
@@ -51,6 +56,12 @@ class OnboardingActivity: MonetCompatActivity() {
                 }
             }
         }
+
+        onBackPressedDispatcher.addCallback(this, object : OnBackPressedCallback(true) {
+            override fun handleOnBackPressed() {
+                handleBackPressed()
+            }
+        })
     }
 
     @Composable
@@ -68,9 +79,7 @@ class OnboardingActivity: MonetCompatActivity() {
                 IconButton(
                     modifier = Modifier.padding(12.dp),
                     onClick = {
-                        coroutineScope.launch {
-                            pagerState.animateScrollToPage(pagerState.currentPage - 1)
-                        }
+                        onBackPressedDispatcher.onBackPressed()
                     }
                 ) {
                     Icon(
@@ -180,7 +189,7 @@ class OnboardingActivity: MonetCompatActivity() {
         }
     }
 
-    override fun onBackPressed() {
+    private fun handleBackPressed() {
         if (pagerState.currentPage == 0) {
             finish()
         } else {
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 07863fc..0c97e05 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -149,6 +149,6 @@
     <string name="search_result_tv_series">TV Series</string>
     <string name="no_search_results">No search results found</string>
     <string name="action_skip">Skip</string>
-    <string name="action_skip_testing">Skip (testing)</string>
+    <string name="action_skip_testing">Skip (t)</string>
     <string name="popular_today_header">Popular Today</string>
 </resources>
\ No newline at end of file