diff --git a/pkg/plugins/dashboard_importer.go b/pkg/plugins/dashboard_importer.go
index 632dbac4e36..a0d065aaf6c 100644
--- a/pkg/plugins/dashboard_importer.go
+++ b/pkg/plugins/dashboard_importer.go
@@ -11,7 +11,7 @@ import (
 	"github.com/grafana/grafana/pkg/services/dashboards"
 )
 
-var varRegex = regexp.MustCompile(`(\$\{.+\})`)
+var varRegex = regexp.MustCompile(`(\$\{.+?\})`)
 
 type ImportDashboardCommand struct {
 	Dashboard *simplejson.Json
diff --git a/pkg/plugins/dashboard_importer_test.go b/pkg/plugins/dashboard_importer_test.go
index f8882cf5eaf..a1af8a0584d 100644
--- a/pkg/plugins/dashboard_importer_test.go
+++ b/pkg/plugins/dashboard_importer_test.go
@@ -58,7 +58,7 @@ func TestDashboardImport(t *testing.T) {
 			}
 		],
 		"test": {
-			"prop": "${DS_NAME}"
+			"prop": "${DS_NAME}_${DS_NAME}"
 		}
 		}`))
 
@@ -73,7 +73,7 @@ func TestDashboardImport(t *testing.T) {
 		So(err, ShouldBeNil)
 
 		Convey("should render template", func() {
-			So(res.GetPath("test", "prop").MustString(), ShouldEqual, "my-server")
+			So(res.GetPath("test", "prop").MustString(), ShouldEqual, "my-server_my-server")
 		})
 
 		Convey("should not include inputs in output", func() {