diff --git a/src/js/codemirror/ubo-static-filtering.js b/src/js/codemirror/ubo-static-filtering.js
index e72c361e5..7b7d26ebe 100644
--- a/src/js/codemirror/ubo-static-filtering.js
+++ b/src/js/codemirror/ubo-static-filtering.js
@@ -512,7 +512,7 @@ function initHints() {
                 matchRight[0]
             );
         }
-        if ( matchLeft[0].startsWith('domain=') ) {
+        if ( /^(domain|from)=/.test(matchLeft[0]) ) {
             return getOriginHints(cursor, line);
         }
     };