diff --git a/app/src/main/java/com/android/developers/androidify/navigation/MainNavigation.kt b/app/src/main/java/com/android/developers/androidify/navigation/MainNavigation.kt
index 1bc07ed7..7d9e2e87 100644
--- a/app/src/main/java/com/android/developers/androidify/navigation/MainNavigation.kt
+++ b/app/src/main/java/com/android/developers/androidify/navigation/MainNavigation.kt
@@ -121,7 +121,9 @@ fun MainNavigation() {
                         backStack.add(Camera)
                     },
                     onBackPressed = {
-                        backStack.removeLastOrNull()
+                        if (backStack.isNotEmpty() && backStack.last() is Create) {
+                            backStack.removeLastOrNull()
+                        }
                     },
                     onAboutPressed = {
                         backStack.add(About)
@@ -131,7 +133,9 @@ fun MainNavigation() {
             entry<About> {
                 AboutScreen(
                     onBackPressed = {
-                        backStack.removeLastOrNull()
+                        if (backStack.isNotEmpty() && backStack.last() is About) {
+                            backStack.removeLastOrNull()
+                        }
                     },
                 )
             }