diff --git a/public/app/plugins/datasource/cloudwatch/queryCtrl.js b/public/app/plugins/datasource/cloudwatch/queryCtrl.js
index c5e672416d1..566b94b3789 100644
--- a/public/app/plugins/datasource/cloudwatch/queryCtrl.js
+++ b/public/app/plugins/datasource/cloudwatch/queryCtrl.js
@@ -116,7 +116,7 @@ function (angular, _) {
       .keys(d)
       .each(function(k) {
         var v = d[k];
-        result[k.replace(/\$/g, '\\$')] = v.replace(/\$/g, '\\$');
+        result[k.replace(/\$/g, '\uFF04')] = v.replace(/\$/g, '\$');
       });
 
       return result;