diff --git a/src/public/javascripts/utils.js b/src/public/javascripts/utils.js
index 6b19a7f53..9b8de60bd 100644
--- a/src/public/javascripts/utils.js
+++ b/src/public/javascripts/utils.js
@@ -121,7 +121,7 @@ function executeScript(script) {
 }
 
 function formatValueWithWhitespace(val) {
-    return /\s/.test(val) ? '"' + val + '"' : val;
+    return /[^\w_-]/.test(val) ? '"' + val + '"' : val;
 }
 
 function formatAttribute(attr) {