diff --git a/src/main/frontend/components/file.cljs b/src/main/frontend/components/file.cljs
index acfc066437..3c9ab2d4ef 100644
--- a/src/main/frontend/components/file.cljs
+++ b/src/main/frontend/components/file.cljs
@@ -105,14 +105,6 @@
          (and format (contains? (config/img-formats) format))
          [:img {:src path}]
 
-         (and format (contains? config/markup-formats format))
-         (when-let [file-content (db/get-file path)]
-           (let [content (string/trim file-content)]
-             (content/content path {:config {:file? true
-                                             :file-path path}
-                                    :content content
-                                    :format format})))
-
          (and format (contains? (config/text-formats) format))
          (when-let [file-content (db/get-file path)]
            (let [content (string/trim file-content)
diff --git a/src/main/frontend/extensions/code.cljs b/src/main/frontend/extensions/code.cljs
index d88a564f9a..518b4c818b 100644
--- a/src/main/frontend/extensions/code.cljs
+++ b/src/main/frontend/extensions/code.cljs
@@ -183,8 +183,7 @@
             (file-handler/alter-file (state/get-current-repo)
                                      path
                                      (str (string/trim value) "\n")
-                                     {:re-render-root? true})
-            (notification/show! "Saved file!" :success)))
+                                     {:re-render-root? true})))
 
         :else
         nil))))
diff --git a/src/main/frontend/fs/node.cljs b/src/main/frontend/fs/node.cljs
index fda487ce83..1ef0fc0be6 100644
--- a/src/main/frontend/fs/node.cljs
+++ b/src/main/frontend/fs/node.cljs
@@ -35,7 +35,7 @@
       (p/resolved (= (string/trim disk-content) (string/trim db-content))))))
 
 (defn- write-file-impl!
-  [this repo dir path content {:keys [ok-handler error-handler skip-compare?] :as opts} stat]
+  [this repo dir path content {:keys [ok-handler error-handler old-content skip-compare?] :as opts} stat]
   (if skip-compare?
     (p/catch
         (p/let [result (ipc/ipc "writeFile" repo path content)]
@@ -55,7 +55,7 @@
             ext (string/lower-case (util/get-file-ext path))
             file-page (db/get-file-page-id path)
             page-empty? (and file-page (db/page-empty? repo file-page))
-            db-content (or (db/get-file repo path) "")
+            db-content (or old-content (db/get-file repo path) "")
             contents-matched? (contents-matched? disk-content db-content)
             pending-writes (state/get-write-chan-length)]
       (cond