diff --git a/lua/modules/configs/editor/autoclose.lua b/lua/modules/configs/editor/autoclose.lua
index b371dd3dd..a8e9d1da5 100644
--- a/lua/modules/configs/editor/autoclose.lua
+++ b/lua/modules/configs/editor/autoclose.lua
@@ -5,14 +5,15 @@ return function()
       ["["] = { escape = false, close = true, pair = "[]" },
       ["{"] = { escape = false, close = true, pair = "{}" },
 
-      [">"] = { escape = true, close = false, pair = "<>" },
       [")"] = { escape = true, close = false, pair = "()" },
       ["]"] = { escape = true, close = false, pair = "[]" },
       ["}"] = { escape = true, close = false, pair = "{}" },
 
       ['"'] = { escape = true, close = true, pair = '""' },
-      ["'"] = { escape = true, close = true, pair = "''" },
       ["`"] = { escape = true, close = true, pair = "``" },
+      ["'"] = { escape = true, close = true, pair = "''", disabled_filetypes = { "rust" } },
+      ["<"] = { escape = true, close = true, pair = "<>", disabled_filetypes = { "cpp" } },
+      [">"] = { escape = true, close = true, pair = "<>", disabled_filetypes = { "cpp" } },
     },
     options = {
       disabled_filetypes = { "big_file_disabled_ft" },