diff --git a/init.lua b/init.lua
index dc05c6c0..55b0f727 100644
--- a/init.lua
+++ b/init.lua
@@ -327,6 +327,7 @@ require('lazy').setup({
       -- Useful for getting pretty icons, but requires a Nerd Font.
       { 'nvim-tree/nvim-web-devicons', enabled = vim.g.have_nerd_font },
       { 'ThePrimeagen/harpoon' },
+      { 'windwp/nvim-ts-autotag' },
     },
     config = function()
       -- Telescope is a fuzzy finder that comes with a lot of different things that
diff --git a/lua/custom/plugins/autotag.lua b/lua/custom/plugins/autotag.lua
new file mode 100644
index 00000000..6807b147
--- /dev/null
+++ b/lua/custom/plugins/autotag.lua
@@ -0,0 +1,20 @@
+return {
+  {
+    -- Also override individual filetype configs, these take priority.
+    -- Empty by default, useful if one of the "opts" global settings
+    -- doesn't work well in a specific filetype
+
+    'nvim-ts-autotag',
+    opts = {
+      -- Defaults
+      enable_close = true, -- Auto close tags
+      enable_rename = true, -- Auto rename pairs of tags
+      enable_close_on_slash = false, -- Auto close on trailing </
+    },
+    per_filetype = {
+      ['html'] = {
+        enable_close = false,
+      },
+    },
+  },
+}