diff --git a/CHANGELOG.md b/CHANGELOG.md
index a3f79411d9..d3dd46c90e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@ Features:
 * Improved performance of LocalIP, NetIO and DNS on Windows
 
 Bugfixes:
+* Fixed `--config`/`-c` bash completion offering one candidate per word instead of one candidate per file for paths containing spaces. (Completion, Bash)
 * Fixed external monitors detected via DDC/CI being randomly reported as built-in, and libddcutil trace messages occasionally leaking into the output and breaking `--format json`. (#2615, Brightness / Linux)
 * Fixed the Vulkan driver name being concatenated with the driver name of a previously enumerated device on systems with more than one GPU. (#2619, Vulkan)
 
diff --git a/completions/fastfetch.bash b/completions/fastfetch.bash
index 681046ddf6..da159f81b9 100644
--- a/completions/fastfetch.bash
+++ b/completions/fastfetch.bash
@@ -33,7 +33,9 @@ _fastfetch() {
       if type _filedir &>/dev/null; then
         _filedir
       elif type compgen &>/dev/null; then
-        COMPREPLY+=($(compgen -f -- "$cur"))
+        local -a files
+        readarray -t files < <(compgen -f -- "$cur")
+        COMPREPLY+=("${files[@]}")
       fi
       return
       ;;