diff --git a/harpoon.el b/harpoon.el
index eed597c..e3ea840 100644
--- a/harpoon.el
+++ b/harpoon.el
@@ -417,7 +417,10 @@ Select items to delete:
 (defun harpoon-toggle-file ()
   "Open harpoon file."
   (interactive)
-  (unless (eq major-mode 'harpoon-mode)
+  (if (eq major-mode 'harpoon-mode)
+      (progn
+        (save-buffer)
+        (switch-to-buffer (other-buffer)))
     (harpoon--create-directory)
     (setq harpoon--current-project-path (when (harpoon--has-project) (harpoon-project-root-function)))
     (find-file (harpoon--file-name) '(:dedicated t))