diff --git a/src/electron/electron/git.cljs b/src/electron/electron/git.cljs
index b97e38c0fe..c3dd28253b 100644
--- a/src/electron/electron/git.cljs
+++ b/src/electron/electron/git.cljs
@@ -116,7 +116,7 @@
                    (if (string/starts-with? error "Author identity unknown")
                      (utils/send-to-renderer "setGitUsernameAndEmail" {:type "git"})
                      (utils/send-to-renderer "notification" {:type "error"
-                                                             :payload error})))))))))
+                                                             :payload (str error "\nIf you don't want to see those errors or don't need git, you can disable the \"Git auto commit\" feature on Settings > Version control.")})))))))))
 
 (defonce quotes-regex #"\"[^\"]+\"")
 (defn wrapped-by-quotes?
diff --git a/src/main/frontend/handler/file.cljs b/src/main/frontend/handler/file.cljs
index 6d0eb1c387..2536723bcd 100644
--- a/src/main/frontend/handler/file.cljs
+++ b/src/main/frontend/handler/file.cljs
@@ -242,7 +242,9 @@
   [repo files {:keys [finish-handler chan]} file->content]
   (let [write-file-f (fn [[path content]]
                        (let [original-content (get file->content path)]
-                         (-> (p/let [_ (nfs/check-directory-permission! repo)]
+                         (-> (p/let [_ (or
+                                        (util/electron?)
+                                        (nfs/check-directory-permission! repo))]
                                (fs/write-file! repo (config/get-repo-dir repo) path content
                                                {:old-content original-content}))
                              (p/catch (fn [error]