diff --git a/src/org/lineageos/setupwizard/BaseSetupWizardActivity.java b/src/org/lineageos/setupwizard/BaseSetupWizardActivity.java
index 6dc3076f..b0e52d55 100644
--- a/src/org/lineageos/setupwizard/BaseSetupWizardActivity.java
+++ b/src/org/lineageos/setupwizard/BaseSetupWizardActivity.java
@@ -15,7 +15,6 @@ import static org.lineageos.setupwizard.SetupWizardApp.LOGV;
 
 import android.annotation.NonNull;
 import android.annotation.Nullable;
-import android.app.ActivityManager;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
@@ -38,13 +37,12 @@ import com.android.settingslib.Utils;
 
 import com.google.android.setupcompat.util.WizardManagerHelper;
 import com.google.android.setupdesign.GlifLayout;
+import com.google.android.setupdesign.transition.TransitionHelper;
 import com.google.android.setupdesign.util.ThemeHelper;
 
 import org.lineageos.setupwizard.NavigationLayout.NavigationBarListener;
 import org.lineageos.setupwizard.util.SetupWizardUtils;
 
-import java.util.List;
-
 public abstract class BaseSetupWizardActivity extends AppCompatActivity implements
         NavigationBarListener {
 
@@ -87,6 +85,8 @@ public abstract class BaseSetupWizardActivity extends AppCompatActivity implemen
                     Log.v(TAG, "handleOnBackPressed()");
                 }
                 finishAction(RESULT_CANCELED, new Intent().putExtra("onBackPressed", true));
+                TransitionHelper.applyBackwardTransition(BaseSetupWizardActivity.this,
+                        TransitionHelper.TRANSITION_FADE_THROUGH, true);
             }
         });
     }
@@ -276,6 +276,8 @@ public abstract class BaseSetupWizardActivity extends AppCompatActivity implemen
         intent.putExtra(WizardManagerHelper.EXTRA_IS_SETUP_FLOW, true);
         intent.putExtra(WizardManagerHelper.EXTRA_THEME, ThemeHelper.THEME_GLIF_V4);
         super.startActivity(intent);
+        TransitionHelper.applyForwardTransition(this,
+                TransitionHelper.TRANSITION_FADE_THROUGH, true);
     }
 
     protected final void startActivityForResult(@NonNull Intent intent) {
@@ -283,6 +285,8 @@ public abstract class BaseSetupWizardActivity extends AppCompatActivity implemen
         intent.putExtra(WizardManagerHelper.EXTRA_IS_SETUP_FLOW, true);
         intent.putExtra(WizardManagerHelper.EXTRA_THEME, ThemeHelper.THEME_GLIF_V4);
         activityResultLauncher.launch(intent);
+        TransitionHelper.applyForwardTransition(this,
+                TransitionHelper.TRANSITION_FADE_THROUGH, true);
     }
 
     protected void onActivityResult(ActivityResult activityResult) {
diff --git a/src/org/lineageos/setupwizard/SubBaseActivity.java b/src/org/lineageos/setupwizard/SubBaseActivity.java
index ac1cd0a9..9379d5e6 100644
--- a/src/org/lineageos/setupwizard/SubBaseActivity.java
+++ b/src/org/lineageos/setupwizard/SubBaseActivity.java
@@ -19,6 +19,8 @@ import android.util.Log;
 
 import androidx.activity.result.ActivityResult;
 
+import com.google.android.setupdesign.transition.TransitionHelper;
+
 public abstract class SubBaseActivity extends BaseSetupWizardActivity {
 
     public static final String TAG = SubBaseActivity.class.getSimpleName();
@@ -80,6 +82,8 @@ public abstract class SubBaseActivity extends BaseSetupWizardActivity {
             finishAction(RESULT_ACTIVITY_NOT_FOUND);
         } else if (data != null && data.getBooleanExtra("onBackPressed", false)) {
             onStartSubactivity();
+            TransitionHelper.applyBackwardTransition(this,
+                    TransitionHelper.TRANSITION_FADE_THROUGH, true);
         } else {
             finishAction(RESULT_CANCELED);
         }