diff --git a/config/plugins/nvim-cmp.vim b/config/plugins/nvim-cmp.vim
index da7a3540b..4dace4f72 100644
--- a/config/plugins/nvim-cmp.vim
+++ b/config/plugins/nvim-cmp.vim
@@ -3,7 +3,7 @@ lua <<EOF
   local cmp = require'cmp'
 
   cmp.setup({
-    mapping = {
+    mapping = cmp.mapping.preset.insert({
       ['<C-d>'] = cmp.mapping(cmp.mapping.scroll_docs(-4), { 'i', 'c' }),
       ['<C-f>'] = cmp.mapping(cmp.mapping.scroll_docs(4), { 'i', 'c' }),
       ['<C-Space>'] = cmp.mapping(cmp.mapping.complete(), { 'i', 'c' }),
@@ -13,7 +13,21 @@ lua <<EOF
         c = cmp.mapping.close(),
       }),
       ['<CR>'] = cmp.mapping.confirm({ select = true }),
-    },
+      ['<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,
+    }),
     formatting = {
       format = require("lspkind").cmp_format({with_text = true, menu = ({
           buffer = "[Buffer]",