diff --git a/feature/creation/src/main/java/com/android/developers/androidify/creation/CreationScreen.kt b/feature/creation/src/main/java/com/android/developers/androidify/creation/CreationScreen.kt
index 42173e3e..1e954e89 100644
--- a/feature/creation/src/main/java/com/android/developers/androidify/creation/CreationScreen.kt
+++ b/feature/creation/src/main/java/com/android/developers/androidify/creation/CreationScreen.kt
@@ -402,7 +402,7 @@ private fun MainCreationPane(
         modifier = modifier,
     ) {
         val spatialSpec = MaterialTheme.motionScheme.slowSpatialSpec<Float>()
-        val pagerState = rememberPagerState(0) { PromptType.entries.size }
+        val pagerState = rememberPagerState(uiState.selectedPromptOption.ordinal) { PromptType.entries.size }
         val focusManager = LocalFocusManager.current
         LaunchedEffect(uiState.selectedPromptOption) {
             launch {