diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 1f51ada27b5..14817e64936 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -47,6 +47,7 @@
   "features": {
     "ghcr.io/devcontainers/features/git:1": {},
     "ghcr.io/devcontainers-community/features/bazel:1": {},
+    "ghcr.io/devcontainers-extra/features/fzf:1": {},
     "ghcr.io/devcontainers/features/docker-outside-of-docker:1": {
       "moby": false
     },
diff --git a/.devcontainer/post-create.sh b/.devcontainer/post-create.sh
index 403a6534c9d..d010f7265ff 100755
--- a/.devcontainer/post-create.sh
+++ b/.devcontainer/post-create.sh
@@ -283,6 +283,11 @@ else
     exit 1
 fi
 
+# Setup fzf bindings
+echo "Setting up fzf bindings..."
+echo 'eval "$(fzf --bash)"' >>"${HOME}/.bashrc"
+echo 'source <(fzf --zsh)' >>"${HOME}/.zshrc"
+
 echo ""
 echo "MongoDB development container setup completed successfully!"
 echo "Info: All infrastructure and dependencies are now configured and up to date."