diff --git a/README.md b/README.md
index f808a1f87..d2b64f266 100644
--- a/README.md
+++ b/README.md
@@ -212,7 +212,7 @@ neogit.setup {
     kind = "floating_console",
   },
   popup = {
-    kind = "split",
+    kind = "popup",
   },
   stash = {
     kind = "tab",
diff --git a/doc/neogit.txt b/doc/neogit.txt
index 90bf911d8..325bf8fa5 100644
--- a/doc/neogit.txt
+++ b/doc/neogit.txt
@@ -229,7 +229,7 @@ to Neovim users.
         kind = "floating_console",
     },
     popup = {
-        kind = "split",
+        kind = "popup",
     },
     stash = {
         kind = "tab",
diff --git a/lua/neogit/config.lua b/lua/neogit/config.lua
index 86a1bd094..3d2c6e759 100644
--- a/lua/neogit/config.lua
+++ b/lua/neogit/config.lua
@@ -88,6 +88,7 @@ end
 ---| "split_below_all" Like :below split
 ---| "vsplit" Open in a vertical split
 ---| "floating" Open in a floating window
+---| "popup" Open in a popup
 ---| "auto" vsplit if window would have 80 cols, otherwise split
 
 ---@class NeogitCommitBufferConfig Commit buffer options
@@ -451,7 +452,7 @@ function M.get_default_values()
       kind = "floating_console",
     },
     popup = {
-      kind = "split",
+      kind = "popup",
     },
     stash = {
       kind = "tab",
@@ -704,13 +705,14 @@ function M.validate_config()
         "floating",
         "floating_console",
         "replace",
+        "popup",
         "auto",
       }, val)
     then
       err(
         name,
         string.format(
-          "Expected `%s` to be one of 'split', 'vsplit', 'split_above', 'vsplit_left', tab', 'floating', 'replace' or 'auto', got '%s'",
+          "Expected `%s` to be one of 'split', 'vsplit', 'split_above', 'split_above_all', 'split_below', 'split_below_all', 'vsplit_left', tab', 'floating', 'floating_console', 'replace', 'popup' or 'auto', got '%s'",
           name,
           val
         )
diff --git a/lua/neogit/lib/popup/init.lua b/lua/neogit/lib/popup/init.lua
index 3d95c5820..623ef1166 100644
--- a/lua/neogit/lib/popup/init.lua
+++ b/lua/neogit/lib/popup/init.lua
@@ -1,3 +1,4 @@
+local config = require("neogit.config")
 local PopupBuilder = require("neogit.lib.popup.builder")
 local Buffer = require("neogit.lib.buffer")
 local logger = require("neogit.logger")
@@ -407,7 +408,7 @@ function M:show()
   self.buffer = Buffer.create {
     name = self.state.name,
     filetype = "NeogitPopup",
-    kind = "popup",
+    kind = config.values.popup.kind,
     mappings = self:mappings(),
     status_column = " ",
     autocmds = {