diff --git a/modules/fish/default.nix b/modules/fish/default.nix
index dea3819..dd7dd4f 100644
--- a/modules/fish/default.nix
+++ b/modules/fish/default.nix
@@ -4,15 +4,19 @@
 
     functions = {
       ff = ''
-        set RG_PREFIX "rg --column --line-number --no-heading --color=always --smart-case "
-        set INITIAL_QUERY "$argv"
-        fzf --ansi --disabled --query "$INITIAL_QUERY" \
-          --bind "start:reload:$RG_PREFIX {q}" \
-          --bind "change:reload:sleep 0.1; $RG_PREFIX {q} || true" \
-          --delimiter : \
-          --preview 'bat --color=always {1} --highlight-line {2}' \
-          --preview-window 'up,60%,border-bottom,+{2}+3/3,~3' \
-          --bind 'enter:become(nvim {1} +{2})'
+        set rg_cmd "rg --column --line-number --no-heading --color=always --smart-case"
+        set initial_query (string join " " $argv)
+
+        fzf --ansi --disabled --query "$initial_query" \
+            --bind "start:reload:$rg_cmd {q}" \
+            --bind "change:reload:sleep 0.1; $rg_cmd {q} || true" \
+            --bind "alt-enter:unbind(change,alt-enter)+change-prompt(2. fzf> )+enable-search+clear-query" \
+            --color "hl:-1:underline,hl+:-1:underline:reverse" \
+            --prompt '1. ripgrep> ' \
+            --delimiter : \
+            --preview 'bat --color=always {1} --highlight-line {2}' \
+            --preview-window 'up,60%,border-bottom,+{2}+3/3,~3' \
+            --bind 'enter:become(nvim {1} +{2})'
       '';
       envsource = ''
         for line in (cat $argv | grep -v '^#')
@@ -26,12 +30,12 @@
         # Usage: resize_images [percentage]
         # Example: resize_images 20 - resizes all images to 20% of original size
         # If no percentage is provided, defaults to 40%
-        
+
         set -l percentage $argv[1]
         if test -z "$percentage"
           set percentage 40
         end
-        
+
         for img in (find . -type f -name "*.JPG")
           set original_size (stat -f %z "$img")
           magick convert "$img" -resize "$percentage%" "$img"