diff --git a/.config/vim/vim_plug b/.config/vim/vim_plug
index 3ccb080..184f77d 100644
--- a/.config/vim/vim_plug
+++ b/.config/vim/vim_plug
@@ -312,6 +312,10 @@ let g:ale_linters = {
 lua <<EOF
   -- Setup nvim-cmp.
   local cmp = require'cmp'
+  local has_words_before = function()
+    local line, col = unpack(vim.api.nvim_win_get_cursor(0))
+    return col ~= 0 and vim.api.nvim_buf_get_lines(0, line - 1, line, true)[1]:sub(col, col):match("%s") == nil
+  end
 
   cmp.setup({
     snippet = {
@@ -332,12 +336,16 @@ lua <<EOF
       ['<C-f>'] = cmp.mapping.scroll_docs(4),
       ['<C-Space>'] = cmp.mapping.complete(),
       ['<C-e>'] = cmp.mapping.abort(),
-      ['<CR>'] = cmp.mapping.confirm({ select = false }), -- Accept currently selected item. Set `select` to `false` to only confirm explicitly selected items.
+      ['<CR>'] = cmp.mapping(function(fallback)
+        if cmp.visible() and not cmp.confirm() then
+          cmp.abort()
+        else
+          fallback()
+        end
+      end, {"i", "s"}),
       ["<Tab>"] = cmp.mapping(function(fallback)
         if cmp.visible() then
           cmp.select_next_item()
-        elseif vim.fn["vsnip#available"](1) == 1 then
-          feedkey("<Plug>(vsnip-expand-or-jump)", "")
         elseif has_words_before() then
           cmp.complete()
         else
@@ -348,8 +356,6 @@ lua <<EOF
       ["<S-Tab>"] = cmp.mapping(function()
         if cmp.visible() then
           cmp.select_prev_item()
-        elseif vim.fn["vsnip#jumpable"](-1) == 1 then
-          feedkey("<Plug>(vsnip-jump-prev)", "")
         end
       end, { "i", "s" }),
     }),