diff --git a/app/src/main/java/com/itsaky/androidide/actions/build/ProjectSyncAction.kt b/app/src/main/java/com/itsaky/androidide/actions/build/ProjectSyncAction.kt
index 27610c87b..eef2def0e 100644
--- a/app/src/main/java/com/itsaky/androidide/actions/build/ProjectSyncAction.kt
+++ b/app/src/main/java/com/itsaky/androidide/actions/build/ProjectSyncAction.kt
@@ -40,7 +40,7 @@ class ProjectSyncAction(context: Context, override val order: Int) : BaseBuildAc
   }
 
   override suspend fun execAction(data: ActionData): Any {
-    return data.requireActivity().saveAll()
+    return data.requireActivity().saveAll(requestSync = false)
   }
 
   override fun postExec(data: ActionData, result: Any) {
diff --git a/app/src/main/java/com/itsaky/androidide/activities/editor/ProjectHandlerActivity.kt b/app/src/main/java/com/itsaky/androidide/activities/editor/ProjectHandlerActivity.kt
index 57a2d37fe..1be27d203 100644
--- a/app/src/main/java/com/itsaky/androidide/activities/editor/ProjectHandlerActivity.kt
+++ b/app/src/main/java/com/itsaky/androidide/activities/editor/ProjectHandlerActivity.kt
@@ -230,7 +230,7 @@ abstract class ProjectHandlerActivity : BaseEditorActivity() {
 
   private fun notifySyncNeeded(onConfirm: () -> Unit) {
     val buildService = Lookup.getDefault().lookup(BuildService.KEY_BUILD_SERVICE)
-    if (buildService == null || buildService.isBuildInProgress) return
+    if (buildService == null || editorViewModel.isInitializing || buildService.isBuildInProgress) return
 
     this.syncNotificationFlashbar?.dismiss()