diff --git a/lua/lazyvim/plugins/coding.lua b/lua/lazyvim/plugins/coding.lua
index f73e2aea..416e3ff2 100644
--- a/lua/lazyvim/plugins/coding.lua
+++ b/lua/lazyvim/plugins/coding.lua
@@ -92,7 +92,20 @@ return {
   -- surround
   {
     "echasnovski/mini.surround",
-    keys = { "gz" },
+    keys = function(plugin, keys)
+      -- Populate the keys based on the user's options
+      local opts = require("lazy.core.plugin").values(plugin, "opts", false)
+      local mappings = {
+        { opts.mappings.add, desc = "Add surrounding", mode = { "n", "v" } },
+        { opts.mappings.delete, desc = "Delete surrounding" },
+        { opts.mappings.find, desc = "Find right surrounding" },
+        { opts.mappings.find_left, desc = "Find left surrounding" },
+        { opts.mappings.highlight, desc = "Highlight surrounding" },
+        { opts.mappings.replace, desc = "Replace surrounding" },
+        { opts.mappings.update_n_lines, desc = "Update `MiniSurround.config.n_lines`" },
+      }
+      return vim.list_extend(mappings, keys)
+    end,
     opts = {
       mappings = {
         add = "gza", -- Add surrounding in Normal and Visual modes
diff --git a/lua/lazyvim/plugins/editor.lua b/lua/lazyvim/plugins/editor.lua
index 92ac85de..5ff2e4b5 100644
--- a/lua/lazyvim/plugins/editor.lua
+++ b/lua/lazyvim/plugins/editor.lua
@@ -138,7 +138,6 @@ return {
     event = "VeryLazy",
     opts = {
       plugins = { spelling = true },
-      key_labels = { ["<leader>"] = "SPC" },
     },
     config = function(_, opts)
       local wk = require("which-key")
@@ -146,6 +145,7 @@ return {
       wk.register({
         mode = { "n", "v" },
         ["g"] = { name = "+goto" },
+        ["gz"] = { name = "+surround" },
         ["]"] = { name = "+next" },
         ["["] = { name = "+prev" },
         ["<leader><tab>"] = { name = "+tabs" },