diff --git a/nvim/.config/nvim/lua/plugins/basic/init.lua b/nvim/.config/nvim/lua/plugins/basic/init.lua
index 711bdbe..2a5c8dc 100644
--- a/nvim/.config/nvim/lua/plugins/basic/init.lua
+++ b/nvim/.config/nvim/lua/plugins/basic/init.lua
@@ -67,10 +67,13 @@ vim.keymap.set("n", "<leader>pf", function()
 	local fzf = require("fzf-lua")
 	local defaults = fzf.defaults.files
 	local fd_opts = defaults.fd_opts
+	local rg_opts = defaults.rg_opts
 	for _, sub in ipairs(get_submodule_excludes()) do
-		fd_opts = fd_opts .. " --exclude " .. sub
+		fd_opts = fd_opts .. " --exclude " .. vim.fn.shellescape(sub)
+		rg_opts = "-g '!" .. sub .. "' " .. rg_opts
 	end
-	fzf.files({ cwd = get_project_root(), fd_opts = fd_opts })
+	rg_opts = "--hidden " .. rg_opts
+	fzf.files({ cwd = get_project_root(), fd_opts = fd_opts, rg_opts = rg_opts })
 end, { desc = "Fuzzy find project files" })
 
 vim.keymap.set("n", "<leader>ps", function()
@@ -78,8 +81,9 @@ vim.keymap.set("n", "<leader>ps", function()
 	local defaults = fzf.defaults.grep
 	local rg_opts = defaults.rg_opts
 	for _, sub in ipairs(get_submodule_excludes()) do
-		rg_opts = rg_opts .. " -g '!" .. sub .. "'"
+		rg_opts = "-g '!" .. sub .. "' " .. rg_opts
 	end
+	rg_opts = "--hidden " .. rg_opts
 	fzf.live_grep({ cwd = get_project_root(), rg_opts = rg_opts })
 end, { desc = "Live grep project text" })