diff --git a/lua/lazyvim/util/toggle.lua b/lua/lazyvim/util/toggle.lua
index 46dc0bd3..c8027666 100644
--- a/lua/lazyvim/util/toggle.lua
+++ b/lua/lazyvim/util/toggle.lua
@@ -12,9 +12,15 @@ local M = {}
 ---@param toggle lazyvim.Toggle
 function M.wrap(toggle)
   return setmetatable(toggle, {
-    __call = function(t)
-      t.set(not t.get())
-      return t.get()
+    __call = function()
+      toggle.set(not toggle.get())
+      local state = toggle.get()
+      if state then
+        LazyVim.info("Enabled " .. toggle.name, { title = toggle.name })
+      else
+        LazyVim.warn("Disabled " .. toggle.name, { title = toggle.name })
+      end
+      return state
     end,
   }) --[[@as lazyvim.Toggle.wrap]]
 end
@@ -24,11 +30,7 @@ end
 function M.map(lhs, toggle)
   local t = M.wrap(toggle)
   LazyVim.safe_keymap_set("n", lhs, function()
-    if t() then
-      LazyVim.info("Enabled " .. toggle.name, { title = toggle.name })
-    else
-      LazyVim.warn("Disabled " .. toggle.name, { title = toggle.name })
-    end
+    t()
   end, { desc = "Toggle " .. toggle.name })
   M.wk(lhs, toggle)
 end