diff --git a/src/buffer.cc b/src/buffer.cc
index 14821f79..1a92b8da 100644
--- a/src/buffer.cc
+++ b/src/buffer.cc
@@ -107,6 +107,8 @@ void Buffer::on_registered()
 
     options().register_watcher(*this);
 
+    run_hook_in_own_context("BufCreate", m_name);
+
     if (m_flags & Flags::File)
     {
         if (m_flags & Buffer::Flags::New)
@@ -118,8 +120,6 @@ void Buffer::on_registered()
         }
     }
 
-    run_hook_in_own_context("BufCreate", m_name);
-
     for (auto& option : options().flatten_options())
         on_option_changed(*option);
 }