diff --git a/share/functions/__fish_is_first_arg.fish b/share/functions/__fish_is_first_arg.fish
index 499b143ae..5eaba6dc8 100644
--- a/share/functions/__fish_is_first_arg.fish
+++ b/share/functions/__fish_is_first_arg.fish
@@ -1,5 +1,5 @@
 # determine if this is the very first argument (regardless if switch or not)
 function __fish_is_first_arg
-    set -l tokens (commandline -co)
+    set -l tokens (commandline -poc)
     test (count $tokens) -eq 1
 end