diff --git a/home-manager/editor/neovim.nix b/home-manager/editor/neovim.nix
index 93c1cb32..1784aaa6 100644
--- a/home-manager/editor/neovim.nix
+++ b/home-manager/editor/neovim.nix
@@ -128,7 +128,7 @@ in
         vim.keymap.set('n', '<C-g>', '<cmd>:noh<CR><CR>')
 
         -- completion
-        vim.opt.completeopt = 'menu'
+        vim.opt.completeopt = 'menu,menuone,noinsert'
         vim.keymap.set({'i', 'c'}, '<C-j>', function()
           return vim.fn.pumvisible() ~= 0 and '<C-n>' or '<C-j>'
         end, { expr = true })
@@ -512,7 +512,10 @@ in
           config = /* lua */ ''
             local cmp = require("cmp")
             cmp.setup({
-              completion = { autocomplete = false },
+              completion = {
+                autocomplete = false,
+                completeopt = 'menu,menuone,noinsert'
+              },
               mapping = {
                 ['<C-b>'] = cmp.mapping.scroll_docs(-4),
                 ['<C-f>'] = cmp.mapping.scroll_docs(4),
@@ -520,7 +523,7 @@ in
                 ['<C-j>'] = cmp.mapping.select_next_item(),
                 ['<C-Space>'] = cmp.mapping.complete(),
                 ['<C-e>'] = cmp.mapping.abort(),
-                ['<CR>'] = cmp.mapping.confirm(),
+                ['<CR>'] = cmp.mapping.confirm({ select = true }),
               },
               snippet = {
                 expand = function(args)