diff --git a/helpfuncs.go b/helpfuncs.go
index 33ab8ed..d8bbd78 100644
--- a/helpfuncs.go
+++ b/helpfuncs.go
@@ -474,6 +474,7 @@ func executeCommandAndDisplay(cmdText string) {
 	}
 	// Create the command execution
 	cmd := exec.Command(command, args...)
+	cmd.Dir = cfg.FilePickerDir
 	// Execute the command and get output
 	output, err := cmd.CombinedOutput()
 	// Add the command being executed to the chat
diff --git a/tools.go b/tools.go
index d3680e0..dc4ff21 100644
--- a/tools.go
+++ b/tools.go
@@ -714,6 +714,7 @@ func executeCommand(args map[string]string) []byte {
 	ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
 	defer cancel()
 	cmd := exec.CommandContext(ctx, command, cmdArgs...)
+	cmd.Dir = cfg.FilePickerDir
 	output, err := cmd.CombinedOutput()
 	if err != nil {
 		msg := fmt.Sprintf("command '%s' failed; error: %v; output: %s", command, err, string(output))