diff --git a/src/CLI2.cpp b/src/CLI2.cpp
index a160bb418..d4683b6fc 100644
--- a/src/CLI2.cpp
+++ b/src/CLI2.cpp
@@ -572,8 +572,9 @@ void CLI2::addContextFilter ()
 
   // The 'undo' command does not apply context.
   auto cmd = getCommand ();
-  if (cmd == "undo" ||
-      cmd == "export")
+  if (cmd    == "undo"   ||
+      cmd    == "export" ||
+      cmd[0] == '_')
     return;
 
 /*