diff --git a/share/completions/commandline.fish b/share/completions/commandline.fish
index 1a7a62b30..f60f9b774 100644
--- a/share/completions/commandline.fish
+++ b/share/completions/commandline.fish
@@ -20,4 +20,4 @@ complete -c commandline -s S -l search-mode -d "Return true if performing a hist
 complete -c commandline -s P -l paging-mode -d "Return true if showing pager content"
 
 
-complete -c commandline -n __fish_commandline_test -a '(bind --function-names)' -d 'Function name' -x
+complete -c commandline -n '__fish_contains_opt -s f function' -a '(bind --function-names)' -d 'Function name' -x
diff --git a/share/functions/__fish_commandline_test.fish b/share/functions/__fish_commandline_test.fish
deleted file mode 100644
index e89b13f11..000000000
--- a/share/functions/__fish_commandline_test.fish
+++ /dev/null
@@ -1,23 +0,0 @@
-
-function __fish_commandline_test
-
-    set -l is_function no
-    for i in (commandline -poc)
-        switch $i
-            case -f --f --fu --fun --func --funct --functi --functio --function
-                set is_function yes
-
-            case --
-                break
-
-
-        end
-    end
-
-    switch $is_function
-        case yes
-            return 0
-    end
-    return 1
-
-end