diff --git a/frontend/src/metabase/lib/expressions.js b/frontend/src/metabase/lib/expressions.js
index bee1f045fd991c2926cb665480bffed802d75660..115fa5ab90f3f3ab5593dd763cf0a0faf7a9cd74 100644
--- a/frontend/src/metabase/lib/expressions.js
+++ b/frontend/src/metabase/lib/expressions.js
@@ -134,6 +134,12 @@ function tokenizeExpression(expressionString) {
         currentToken.value += c;
     }
 
+    // Replace operators in expressionString making sure the operators have exactly one space before and after
+    VALID_OPERATORS.forEach(function(operator) {
+        let regex = new RegExp("\\s*[\\" + operator + "]\\s*");
+        expressionString = expressionString.replace(regex, ' ' + operator + ' ');
+    });
+
     for (; i < expressionString.length; i++) {
         let c = expressionString.charAt(i);