diff --git a/nvim/lua/plugs/surround.lua b/nvim/lua/plugs/surround.lua
index 561ef50..9778fb8 100644
--- a/nvim/lua/plugs/surround.lua
+++ b/nvim/lua/plugs/surround.lua
@@ -3,6 +3,14 @@ return {
     version = "*",
     event = "VeryLazy",
     config = function()
-        require("nvim-surround").setup({})
+        require("nvim-surround").setup({
+            -- Make sure that we never get whitespaces when adding surroundings
+            surrounds = {
+                ["("] = { add = { "(", ")" }, },
+                ["{"] = { add = { "{", "}" }, },
+                ["<"] = { add = { "<", ">" }, },
+                ["["] = { add = { "[", "]" }, },
+            }
+        })
     end,
 }