diff --git a/lazy-lock.json b/lazy-lock.json
index 6147d872..34e95550 100644
--- a/lazy-lock.json
+++ b/lazy-lock.json
@@ -14,6 +14,7 @@
   "mason-lspconfig.nvim": { "branch": "main", "commit": "0954d7730e749d606ddf8d7ae8846848be435d53" },
   "mason.nvim": { "branch": "main", "commit": "c43eeb5614a09dc17c03a7fb49de2e05de203924" },
   "neodev.nvim": { "branch": "main", "commit": "0ee95ecefc8ea45898a0383364f736e098c8703f" },
+  "nvim-autopairs": { "branch": "master", "commit": "096d0baecc34f6c5d8a6dd25851e9d5ad338209b" },
   "nvim-cmp": { "branch": "main", "commit": "04e0ca376d6abdbfc8b52180f8ea236cbfddf782" },
   "nvim-lspconfig": { "branch": "master", "commit": "d12140c5687a1186b95b3f42dbc6cc769df0cf0d" },
   "nvim-treesitter": { "branch": "master", "commit": "4fbf150a1621d52f17b099506e1a32f107079210" },
diff --git a/lua/plugins/autocompletion.lua b/lua/plugins/autocompletion.lua
index d14bdfa6..15d46077 100644
--- a/lua/plugins/autocompletion.lua
+++ b/lua/plugins/autocompletion.lua
@@ -12,10 +12,18 @@ return {
 
 		-- Adds a number of user-friendly snippets
 		'rafamadriz/friendly-snippets',
+
+		-- Auto-closing brackets, quotes, etc.
+		'windwp/nvim-autopairs',
 	},
 	config = function()
+		local cmp_autopairs = require('nvim-autopairs.completion.cmp')
 		local cmp = require 'cmp'
 		local luasnip = require 'luasnip'
+
+		require('nvim-autopairs').setup();
+		cmp.event:on('confirm_done', cmp_autopairs.on_confirm_done())
+
 		require('luasnip.loaders.from_vscode').lazy_load()
 		luasnip.config.setup {}