diff --git a/lua/user/autocommands.lua b/lua/user/autocommands.lua
index 7a19a9d3..26bbe4c6 100644
--- a/lua/user/autocommands.lua
+++ b/lua/user/autocommands.lua
@@ -57,12 +57,6 @@ vim.api.nvim_create_autocmd({ "VimResized" }, {
   end,
 })
 
-vim.api.nvim_create_autocmd({ "CmdWinEnter" }, {
-  callback = function()
-    vim.cmd "quit"
-  end,
-})
-
 vim.api.nvim_create_autocmd({ "CursorMoved", "BufWinEnter", "BufFilePost", "InsertEnter", "BufWritePost" }, {
   callback = function()
     require("user.winbar").get_winbar()
diff --git a/lua/user/winbar.lua b/lua/user/winbar.lua
index 5ee566f4..12d08039 100644
--- a/lua/user/winbar.lua
+++ b/lua/user/winbar.lua
@@ -1,5 +1,9 @@
 local M = {}
 
+M.winbar_buftype_exclude = {
+    "nofile"
+}
+
 M.winbar_filetype_exclude = {
   "help",
   "startify",
@@ -62,7 +66,7 @@ local get_gps = function()
 end
 
 local excludes = function()
-  if vim.tbl_contains(M.winbar_filetype_exclude, vim.bo.filetype) then
+  if vim.tbl_contains(M.winbar_filetype_exclude, vim.bo.filetype) or vim.tbl_contains(M.winbar_buftype_exclude, vim.bo.buftype) then
     vim.opt_local.winbar = nil
     return true
   end