diff --git a/functions/__interactive_history_sub.fish b/functions/__interactive_history_sub.fish
index fed0d64..ce569b8 100644
--- a/functions/__interactive_history_sub.fish
+++ b/functions/__interactive_history_sub.fish
@@ -6,8 +6,18 @@ function __interactive_history_sub
         set -l parts (string split '/' -- "$current_line")
         set -l old $parts[1]
         set -l new $parts[2]
-        set -l expanded (string replace -a -- "$old" "$new" "$last_cmd")
-        commandline -r "$expanded"
+        set -l history_index 1
+        
+        if test (count $parts) -ge 3; and string match -qr '^[1-9][0-9]*$' -- "$parts[3]"
+            set history_index $parts[3]
+        end
+        
+        set -l target_cmd $history[$history_index]
+        
+        if test -n "$target_cmd"
+            set -l expanded (string replace -a -- "$old" "$new" "$target_cmd")
+            commandline -r "$expanded"
+        end
     else
         if test -z "$current_line"
             commandline -r "sudo $last_cmd"