diff --git a/nvim/.config/nvim/lua/config/autopairs.lua b/nvim/.config/nvim/lua/config/autopairs.lua
new file mode 100644
index 0000000..a1195cd
--- /dev/null
+++ b/nvim/.config/nvim/lua/config/autopairs.lua
@@ -0,0 +1,9 @@
+local autopairs_status_ok, autopairs = pcall(require, "'nvim-autopairs")
+if not autopairs_status_ok then
+  return
+end
+
+autopairs.setup{
+        ignored_next_char = string.gsub([[ [%w%%%'%[%"%.] ]],"%s+", ""),
+}
+
diff --git a/nvim/.config/nvim/lua/plugins.lua b/nvim/.config/nvim/lua/plugins.lua
index 1fe0356..71b849a 100644
--- a/nvim/.config/nvim/lua/plugins.lua
+++ b/nvim/.config/nvim/lua/plugins.lua
@@ -102,7 +102,11 @@ return packer.startup(function(use)
     --  Highlight on Yank 
     use 'machakann/vim-highlightedyank'
     --  Autoclose parenthesis
-    use 'jiangmiao/auto-pairs'
+    -- use 'jiangmiao/auto-pairs'
+    use {
+        'windwp/nvim-autopairs',
+        config = [[ require('config.autopairs') ]]
+    }
 
     use 'kyazdani42/nvim-web-devicons'
     use {