diff --git a/nvim/lua/plugins.lua b/nvim/lua/plugins.lua
index 717524f..5055c40 100644
--- a/nvim/lua/plugins.lua
+++ b/nvim/lua/plugins.lua
@@ -73,9 +73,13 @@ require("lazy").setup({
 				sources = {
 					{ name = "nvim_lsp" },
 				},
+				completion = {
+					-- Highlight first item in completion menu automatically
+					completeopt = "menu,menuone,noinsert",
+				},
 				mapping = cmp.mapping.preset.insert({
 					-- Enter key confirms completion item
-					["<CR>"] = cmp.mapping.confirm({ select = true }),
+					["<CR>"] = cmp.mapping.confirm({ select = false }),
 
 					-- Ctrl + space triggers completion menu
 					["<C-Space>"] = cmp.mapping.complete(),
@@ -166,7 +170,8 @@ require("lazy").setup({
 			require("supermaven-nvim").setup({})
 
 			-- Disable on startup
-			vim.api.nvim_command("silent! SupermavenStop")
+			local api = require("supermaven-nvim.api")
+			api.stop()
 		end,
 	},