diff --git a/app/src/main/java/com/example/cahier/MainActivity.kt b/app/src/main/java/com/example/cahier/MainActivity.kt
index 132daef..df24602 100644
--- a/app/src/main/java/com/example/cahier/MainActivity.kt
+++ b/app/src/main/java/com/example/cahier/MainActivity.kt
@@ -116,11 +116,11 @@ class MainActivity : ComponentActivity() {
             intent.action = null
             intent.data = null
             lifecycleScope.launch {
+                navigateToBrushGraphState.value = true
                 val repo = repository.get()
                 val success = repo.importBrushFromUri(uri.toString())
                 if (success) {
                     android.util.Log.d("MainActivity", "Import brush SUCCESS")
-                    navigateToBrushGraphState.value = true
                     repo.postDebug(DisplayText.Resource(com.example.cahier.R.string.bg_msg_brush_loaded_success))
                 } else {
                     android.util.Log.e("MainActivity", "Import brush FAILED")
diff --git a/app/src/main/java/com/example/cahier/features/home/CahierApp.kt b/app/src/main/java/com/example/cahier/features/home/CahierApp.kt
index c25ca46..5c7a07c 100644
--- a/app/src/main/java/com/example/cahier/features/home/CahierApp.kt
+++ b/app/src/main/java/com/example/cahier/features/home/CahierApp.kt
@@ -53,7 +53,9 @@ fun CahierApp(
 
     LaunchedEffect(navigateToBrushGraph) {
         if (navigateToBrushGraph) {
-            navController.navigate(BrushGraphDestination.route)
+            if (navController.currentDestination?.route != BrushGraphDestination.route) {
+                navController.navigate(BrushGraphDestination.route)
+            }
             onNavigateToBrushGraphHandled()
         }
     }