diff --git a/share/functions/fish_vi_cursor.fish b/share/functions/fish_vi_cursor.fish
index 4d2f6a1b1..9be608da7 100644
--- a/share/functions/fish_vi_cursor.fish
+++ b/share/functions/fish_vi_cursor.fish
@@ -44,12 +44,10 @@ function fish_vi_cursor -d 'Set cursor shape for different vi modes'
     # HACK: Explicitly disable on ITERM because of #3696, which is weirdness with multi-line prompts.
     # We allow an explicit "--force-iterm" as first argument to skip this.
     # It's recommended only if you don't use a multi-line prompt.
-    if set -q ITERM_PROFILE
-        if contains -- $argv[1] --force-iterm
-            set -e argv[1]
-        else
-            return
-        end
+    if contains -- $argv[1] --force-iterm
+        set -e argv[1]
+    else if set -q ITERM_PROFILE
+        return
     end
 
     set -l terminal $argv[1]