diff --git a/src/builtins/commandline.rs b/src/builtins/commandline.rs
index 184184ed1..6fba013ed 100644
--- a/src/builtins/commandline.rs
+++ b/src/builtins/commandline.rs
@@ -397,8 +397,8 @@ pub fn commandline(parser: &Parser, streams: &mut IoStreams, args: &mut [&wstr])
         return STATUS_INVALID_ARGS;
     }
 
-    if search_field_mode && buffer_part.is_some() {
-        streams.err.append(wgettext_fmt!(BUILTIN_ERR_COMBO, cmd,));
+    if search_field_mode && (buffer_part.is_some() || token_mode.is_some()) {
+        streams.err.append(wgettext_fmt!(BUILTIN_ERR_COMBO, cmd));
         builtin_print_error_trailer(parser, streams.err, cmd);
         return STATUS_INVALID_ARGS;
     }