From 481b9f86519ff3337f1344de7bf1fc81b110229d Mon Sep 17 00:00:00 2001
From: Your Name <your-email@example.com>
Date: Mon, 16 Mar 2026 01:01:38 -0700
Subject: [PATCH] Fix #7008: bug: Shortcuts to mason.nvim not working in lazy
 menu

---
 lua/lazyvim/plugins/lsp/init.lua | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/lua/lazyvim/plugins/lsp/init.lua b/lua/lazyvim/plugins/lsp/init.lua
index 1a3708e1..0f32ad06 100644
--- a/lua/lazyvim/plugins/lsp/init.lua
+++ b/lua/lazyvim/plugins/lsp/init.lua
@@ -267,7 +267,27 @@ return {
 
     "mason-org/mason.nvim",
     cmd = "Mason",
-    keys = { { "<leader>cm", "<cmd>Mason<cr>", desc = "Mason" } },
+    keys = {
+      {
+        "<leader>cm",
+        function()
+          -- Close any floating windows that might be the lazy menu
+          for _, win in ipairs(vim.api.nvim_list_wins()) do
+            local config = vim.api.nvim_win_get_config(win)
+            if config.relative ~= "" then
+              local buf = vim.api.nvim_win_get_buf(win)
+              local bufname = vim.api.nvim_buf_get_name(buf)
+              -- Close floating windows that are likely from lazy.nvim
+              if bufname:find("lazy", 1, true) or vim.bo[buf].filetype == "lazy" then
+                vim.api.nvim_win_close(win, false)
+              end
+            end
+          end
+          vim.cmd("Mason")
+        end,
+        desc = "Mason",
+      },
+    },
     build = ":MasonUpdate",
     opts_extend = { "ensure_installed" },
     opts = {