diff --git a/lua/plugins/astrocore.lua b/lua/plugins/astrocore.lua
index 9391035..429cf14 100644
--- a/lua/plugins/astrocore.lua
+++ b/lua/plugins/astrocore.lua
@@ -14,6 +14,39 @@ local file_filter = ignore_patterns.create_picker_filter()
 
 return {
   "AstroNvim/astrocore",
+  dependencies = {
+    {
+      "coder/claudecode.nvim",
+      dependencies = { "folke/snacks.nvim" },
+      config = true,
+    },
+    {
+      "pittcat/claude-fzf.nvim",
+      dependencies = {
+        "ibhagwan/fzf-lua",
+        "coder/claudecode.nvim",
+      },
+      opts = {
+        auto_context = true,
+        batch_size = 10,
+      },
+      cmd = {
+        "ClaudeFzf",
+        "ClaudeFzfFiles",
+        "ClaudeFzfGrep",
+        "ClaudeFzfBuffers",
+        "ClaudeFzfGitFiles",
+        "ClaudeFzfDirectory",
+      },
+      keys = {
+        { "<C-a><C-f>", "<cmd>ClaudeFzfFiles<cr>", desc = "Claude: Add files" },
+        { "<C-a><C-f>g", "<cmd>ClaudeFzfGrep<cr>", desc = "Claude: Search and add" },
+        { "<C-a><C-f>b", "<cmd>ClaudeFzfBuffers<cr>", desc = "Claude: Add buffers" },
+        { "<C-a><C-f>G", "<cmd>ClaudeFzfGitFiles<cr>", desc = "Claude: Add Git files" },
+        { "<C-a><C-f>d", "<cmd>ClaudeFzfDirectory<cr>", desc = "Claude: Add directory files" },
+      },
+    },
+  },
   ---@type AstroCoreOpts
   opts = {
 
diff --git a/lua/plugins/claude.lua b/lua/plugins/claude.lua
deleted file mode 100644
index e9d4164..0000000
--- a/lua/plugins/claude.lua
+++ /dev/null
@@ -1,26 +0,0 @@
---- Claude Code integration for AI-powered development
---- Provides commands and keybindings for Claude Code assistant
---- @module plugins.claude
-
----@type LazySpec
-return {
-  "coder/claudecode.nvim",
-  dependencies = { "folke/snacks.nvim" },
-  config = true,
-  keys = {
-    { "<C-a><C-a>", "<cmd>ClaudeCode<cr>", desc = "Toggle Claude" },
-    { "<C-a>f", "<cmd>ClaudeCodeFocus<cr>", desc = "Focus Claude" },
-    { "<C-a>C", "<cmd>ClaudeCode --resume<cr>", desc = "Resume Claude" },
-    { "<C-a>c", "<cmd>ClaudeCode --continue<cr>", desc = "Continue Claude" },
-    { "<C-a>m", "<cmd>ClaudeCodeSelectModel<cr>", desc = "Select Claude model" },
-    { "<C-a>b", "<cmd>ClaudeCodeAdd %<cr>", desc = "Add current buffer" },
-    { "<C-a>y", "<cmd>ClaudeCodeDiffAccept<cr>", desc = "Accept diff" },
-    { "<C-a>n", "<cmd>ClaudeCodeDiffDeny<cr>", desc = "Deny diff" },
-    {
-      "<C-a>",
-      "<cmd>ClaudeCodeTreeAdd<cr>",
-      desc = "Add file from explorer",
-      ft = { "NvimTree", "neo-tree", "oil", "minifiles", "netrw" },
-    },
-  },
-}