diff --git a/emacs/init.el b/emacs/init.el
index af62878..dbfe509 100644
--- a/emacs/init.el
+++ b/emacs/init.el
@@ -10,7 +10,6 @@
         global-mark-ring-max 1024
         inhibit-compacting-font-caches t
         inhibit-startup-screen t
-        initial-buffer-choice "~/org/init.org"
         initial-scratch-message nil
         mark-ring-max 1024)
 
@@ -61,6 +60,12 @@
 (add-hook 'hack-local-variables-hook #'agw-after-local-vars)
 
 ;; macros
+(setq initial-buffer-choice
+      (lambda ()
+        (if (buffer-file-name)
+            (current-buffer)
+          (find-file "~/org/init.org"))))
+
 (add-hook 'emacs-lisp-mode-hook #'agw-fp-mode)
 (add-hook 'lisp-mode-hook       #'agw-fp-mode)
 (add-hook 'reb-lisp-mode-hook   #'agw-fp-mode)