diff --git a/neovim/.config/nvim/after/plugin/remaps.lua b/neovim/.config/nvim/after/plugin/remaps.lua
index 166d7ec..d7efbc0 100644
--- a/neovim/.config/nvim/after/plugin/remaps.lua
+++ b/neovim/.config/nvim/after/plugin/remaps.lua
@@ -4,7 +4,10 @@ local git = require("daniil.git")
 
 -- General keymaps
 vim.keymap.set("n", "<C-c>", ":nohl<CR>")
-vim.keymap.set("n", "<C-q>", "<C-W>q")
+
+-- Quickfix and location list remaps
+vim.keymap.set("n", "<C-q>", u.toggle_qflist)
+vim.keymap.set("n", "<leader>q", u.toggle_locationlist)
 
 -- Disable PageUp and PageDown keys
 vim.keymap.set({ "n", "i", "v" }, "<PageDown>", "<nop>")
diff --git a/neovim/.config/nvim/lua/daniil/utils.lua b/neovim/.config/nvim/lua/daniil/utils.lua
index 4b750bd..68ccac3 100644
--- a/neovim/.config/nvim/lua/daniil/utils.lua
+++ b/neovim/.config/nvim/lua/daniil/utils.lua
@@ -109,4 +109,20 @@ function M.open_unsaved_buffers()
   end
 end
 
+function M.toggle_qflist()
+  if vim.bo.ft == "qf" then
+    vim.cmd(":cclose")
+  else
+    vim.cmd(":copen")
+  end
+end
+
+function M.toggle_locationlist()
+  if vim.bo.ft == "qf" then
+    vim.cmd(":lclose")
+  else
+    vim.cmd(":lopen")
+  end
+end
+
 return M