diff --git a/app/src/main/java/com/example/onecamera/navigation/OneCameraNavGraph.kt b/app/src/main/java/com/example/onecamera/navigation/OneCameraNavGraph.kt
index ed1af65..487e47b 100644
--- a/app/src/main/java/com/example/onecamera/navigation/OneCameraNavGraph.kt
+++ b/app/src/main/java/com/example/onecamera/navigation/OneCameraNavGraph.kt
@@ -67,8 +67,14 @@ fun OneCameraNavGraph(navController: NavHostController) {
         navController = navController,
         startDestination = FoldersRoute,
         enterTransition = { if (transitionsEnabled) fadeIn(tween(250)) else EnterTransition.None },
-        exitTransition = { if (transitionsEnabled) fadeOut(tween(250)) else ExitTransition.None },
-        popEnterTransition = { if (transitionsEnabled) fadeIn(tween(250)) else EnterTransition.None },
+        exitTransition = {
+            if (transitionsEnabled) {
+                ExitTransition.KeepUntilTransitionsFinished
+            } else {
+                ExitTransition.None
+            }
+        },
+        popEnterTransition = { EnterTransition.None },
         popExitTransition = { if (transitionsEnabled) fadeOut(tween(250)) else ExitTransition.None },
     ) {
         composable<FoldersRoute> {