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 dcd5ce44..42173e3e 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
@@ -151,7 +151,6 @@ import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import com.android.developers.androidify.creation.R as CreationR
 
-@OptIn(ExperimentalMaterial3ExpressiveApi::class)
 @Composable
 fun CreationScreen(
     fileName: String? = null,
@@ -364,7 +363,9 @@ fun EditScreen(
                     }
                 } else {
                     BottomButtons(
-                        onButtonColorClicked = { showColorPickerBottomSheet = !showColorPickerBottomSheet },
+                        onButtonColorClicked = {
+                            showColorPickerBottomSheet = !showColorPickerBottomSheet
+                        },
                         uiState = uiState,
                         onStartClicked = onStartClicked,
                         modifier = Modifier
@@ -404,10 +405,16 @@ private fun MainCreationPane(
         val pagerState = rememberPagerState(0) { PromptType.entries.size }
         val focusManager = LocalFocusManager.current
         LaunchedEffect(uiState.selectedPromptOption) {
-            pagerState.animateScrollToPage(
-                uiState.selectedPromptOption.ordinal,
-                animationSpec = spatialSpec,
-            )
+            launch {
+                pagerState.animateScrollToPage(
+                    uiState.selectedPromptOption.ordinal,
+                    animationSpec = spatialSpec,
+                )
+            }.invokeOnCompletion {
+                if (uiState.selectedPromptOption != PromptType.entries[pagerState.currentPage]) {
+                    onSelectedPromptOptionChanged(PromptType.entries[pagerState.currentPage])
+                }
+            }
         }
         LaunchedEffect(pagerState) {
             snapshotFlow { pagerState.currentPage }.collect { page ->