diff --git a/data/nvim/init.lua b/data/nvim/init.lua
index 5e01eb9..8d2ebb2 100644
--- a/data/nvim/init.lua
+++ b/data/nvim/init.lua
@@ -191,7 +191,27 @@ require("lazy").setup({
 				},
 				mapping = cmp.mapping.preset.insert({
 					["<C-Space>"] = cmp.mapping.complete(),
-					["<CR>"] = cmp.mapping.confirm(),
+					["<CR>"] = function(fallback)
+						if cmp.visible() then
+							cmp.confirm()
+						else
+							fallback()
+						end
+					end,
+					["<Tab>"] = function(fallback)
+						if cmp.visible() then
+							cmp.select_next_item()
+						else
+							fallback()
+						end
+					end,
+					["<S-Tab>"] = function(fallback)
+						if cmp.visible() then
+							cmp.select_prev_item()
+						else
+							fallback()
+						end
+					end,
 				}),
 				sources = cmp.config.sources({
 					{ name = "nvim_lsp" },