diff --git a/ChangeLog b/ChangeLog
index f3ed239fc..52cc91c87 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -133,6 +133,7 @@
 - TW-1366 In diagnostics it's called 'Cert', and in config it's called
           'certificate' (thanks to Jack).
 - TW-1373 taskrc.vim VIM syntax file updated (thanks to lolilolicon).
+- TW-1377 Tags in default.command are treated as "operator text".
 - TW-1381 blocking report exits with "Unknown error" and exit code 3.
 - TW-1383 Segmentation fault running import-yaml.pl with included example
           (thanks to Markus Beppler).
diff --git a/src/Parser.cpp b/src/Parser.cpp
index e346f1a65..327821af3 100644
--- a/src/Parser.cpp
+++ b/src/Parser.cpp
@@ -567,12 +567,15 @@ void Parser::injectDefaults ()
         // because captureFirst inserts args immediately after the command, and
         // so has the effect of reversing the list.
         std::vector <std::string> args;
-        Lexer::token_split (args, defaultCommand);
+        split (args, defaultCommand, ' ');
         std::vector <std::string>::reverse_iterator r;
         for (r = args.rbegin (); r != args.rend (); ++r)
         {
-          Tree* t = captureFirst (*r);
-          t->tag ("DEFAULT");
+          if (*r != "")
+          {
+            Tree* t = captureFirst (*r);
+            t->tag ("DEFAULT");
+          }
         }
 
         std::string combined;