diff --git a/common/.config/nvim/lua/lsp-general.lua b/common/.config/nvim/lua/lsp-general.lua
index 127c3a6..f4234d7 100644
--- a/common/.config/nvim/lua/lsp-general.lua
+++ b/common/.config/nvim/lua/lsp-general.lua
@@ -1,6 +1,8 @@
 local lsp = require('lsp-zero')
 local cmp = require ('cmp')
-lsp.preset("recommended")
+lsp.preset({
+    name = 'recommended',
+})
 
 lsp.ensure_installed({
   'tsserver',
@@ -19,14 +21,10 @@ lsp.configure('lua-language-server', {
 })
 
 local cmp = require('cmp')
-local cmp_select = { behavior = cmp.SelectBehavior.Select }
+local cmp_mode = { behavior = cmp.SelectBehavior.Replace }
 local cmp_mappings = lsp.defaults.cmp_mappings({
-    ["<Tab>"] = cmp.mapping.select_next_item(cmp_select),
-    ["<S-Tab>"] = cmp.mapping.select_prev_item(cmp_select),
-    ["<CR>"] = cmp.mapping.confirm({
-        behavior = cmp.ConfirmBehavior.Replace,
-        select = true,
-    }),
+    ["<Tab>"] = cmp.mapping.select_next_item(cmp_mode),
+    ["<S-Tab>"] = cmp.mapping.select_prev_item(cmp_mode),
 })
 
 -- unmap arrow keys
@@ -34,10 +32,13 @@ cmp_mappings["<Up>"] = nil
 cmp_mappings["<Down>"] = nil
 
 lsp.setup_nvim_cmp({
+    preselect = require('cmp').PreselectMode.None,
+    completion = {
+        completeopt = 'menu,menuone,noinsert,noselect'
+    },
     mapping = cmp_mappings,
 })
 
-
 cmp.setup.cmdline('/', {
     sources = {
         { name = 'buffer' }
diff --git a/common/.config/nvim/lua/plugins.lua b/common/.config/nvim/lua/plugins.lua
index dfa8ce9..5c120eb 100644
--- a/common/.config/nvim/lua/plugins.lua
+++ b/common/.config/nvim/lua/plugins.lua
@@ -8,6 +8,7 @@ if fn.empty(fn.glob(installPath)) > 0 then
     vim.cmd [[packadd packer.nvim]]
 end
 
+
 local packer = require('packer').startup(function(use)
     -- Packer should manage itself
     use 'wbthomason/packer.nvim'