diff --git a/nvim/.config/nvim/after/ftplugin/gitcommit.vim b/nvim/.config/nvim/after/ftplugin/gitcommit.vim
index e2d4e24..6a2130d 100644
--- a/nvim/.config/nvim/after/ftplugin/gitcommit.vim
+++ b/nvim/.config/nvim/after/ftplugin/gitcommit.vim
@@ -1,6 +1,7 @@
 setlocal spell
 setlocal textwidth=72
 setlocal iskeyword+=-
+setlocal bufhidden=delete
 
 " Jump to sections of diff
 nmap <buffer> [c ?^@@<CR>
diff --git a/nvim/.config/nvim/after/ftplugin/gitconfig.vim b/nvim/.config/nvim/after/ftplugin/gitconfig.vim
new file mode 100644
index 0000000..37a7efd
--- /dev/null
+++ b/nvim/.config/nvim/after/ftplugin/gitconfig.vim
@@ -0,0 +1 @@
+setlocal bufhidden=delete
diff --git a/nvim/.config/nvim/after/ftplugin/gitrebase.vim b/nvim/.config/nvim/after/ftplugin/gitrebase.vim
index 5afa5e8..57ef2a2 100644
--- a/nvim/.config/nvim/after/ftplugin/gitrebase.vim
+++ b/nvim/.config/nvim/after/ftplugin/gitrebase.vim
@@ -5,3 +5,5 @@ nnoremap <buffer> <silent> <Leader>e :Edit<CR>
 nnoremap <buffer> <silent> <Leader>r :Reword<CR>
 nnoremap <buffer> <silent> <Leader>f :Fixup<CR>
 nnoremap <buffer> <silent> <Leader>c :Cycle<CR>
+
+setlocal bufhidden=delete
diff --git a/nvim/.config/nvim/lua/modules/floaterm.lua b/nvim/.config/nvim/lua/modules/floaterm.lua
index f3229de..b54accc 100644
--- a/nvim/.config/nvim/lua/modules/floaterm.lua
+++ b/nvim/.config/nvim/lua/modules/floaterm.lua
@@ -6,6 +6,7 @@ vim.g.floaterm_width         = 0.8
 vim.g.floaterm_height        = 0.8
 vim.g.floaterm_winblend      = 0
 vim.g.floaterm_borderchars   = {'─', '│', '─', '│', '╭', '╮', '╯', '╰'}
+vim.g.floaterm_gitcommit     = 'floaterm'
 
 remap('n', '<C-z>', ':FloatermToggle<CR>', { noremap = true, silent = true })
 remap('t', '<C-z>', '<C-\\><C-n>:FloatermToggle<CR>', { noremap = true, silent = true })