diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1a8450a80e8..230ff061e8d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,7 @@
 - [Issue #1309](https://github.com/grafana/grafana/issues/1309). Graph: Fixed issue when using zero as a grid threshold
 - [Issue #1345](https://github.com/grafana/grafana/issues/1345). UI: Fixed position of confirm modal when scrolled down
 - [Issue #1372](https://github.com/grafana/grafana/issues/1372). Graphite: Fix for nested complex queries, where a query references a query that references another query (ie the #[A-Z] syntax)
+- [Issue #1363](https://github.com/grafana/grafana/issues/1363). Templating: Fix to allow custom template variables to contain white space, now only splits on ','
 
 **Tech**
 - [Issue #1311](https://github.com/grafana/grafana/issues/1311). Tech: Updated Font-Awesome from 3.2 to 4.2
diff --git a/src/app/features/templating/templateValuesSrv.js b/src/app/features/templating/templateValuesSrv.js
index 51b11dfb3fa..0add3fc5df9 100644
--- a/src/app/features/templating/templateValuesSrv.js
+++ b/src/app/features/templating/templateValuesSrv.js
@@ -81,7 +81,7 @@ function (angular, _, kbn) {
 
     this._updateNonQueryVariable = function(variable) {
       // extract options in comma seperated string
-      variable.options = _.map(variable.query.split(/[\s,]+/), function(text) {
+      variable.options = _.map(variable.query.split(/[,]+/), function(text) {
         return { text: text, value: text };
       });