diff --git a/pkg/api/frontendsettings.go b/pkg/api/frontendsettings.go
index ed7054050e4..238a3965641 100644
--- a/pkg/api/frontendsettings.go
+++ b/pkg/api/frontendsettings.go
@@ -145,6 +145,7 @@ func (hs *HTTPServer) getFrontendSettingsMap(c *m.ReqContext) (map[string]interf
 			"info":         panel.Info,
 			"hideFromList": panel.HideFromList,
 			"sort":         getPanelSort(panel.Id),
+			"isDataPanel":  panel.IsDataPanel,
 		}
 	}
 
diff --git a/pkg/plugins/models.go b/pkg/plugins/models.go
index 5ac436205c1..e37b1fcf7d9 100644
--- a/pkg/plugins/models.go
+++ b/pkg/plugins/models.go
@@ -47,6 +47,7 @@ type PluginBase struct {
 	BaseUrl      string             `json:"baseUrl"`
 	HideFromList bool               `json:"hideFromList,omitempty"`
 	State        PluginState        `json:"state,omitempty"`
+	IsDataPanel  bool               `json:"isDataPanel"`
 
 	IncludedInAppId string `json:"-"`
 	PluginDir       string `json:"-"`
diff --git a/public/app/plugins/panel/gauge/plugin.json b/public/app/plugins/panel/gauge/plugin.json
index 58437779d25..733d2281cf4 100644
--- a/public/app/plugins/panel/gauge/plugin.json
+++ b/public/app/plugins/panel/gauge/plugin.json
@@ -2,6 +2,7 @@
   "type": "panel",
   "name": "Gauge",
   "id": "gauge",
+  "isDataPanel": true,
 
   "info": {
     "author": {
diff --git a/public/app/plugins/panel/graph2/plugin.json b/public/app/plugins/panel/graph2/plugin.json
index 9cb6a1f78a4..9b2a915a597 100644
--- a/public/app/plugins/panel/graph2/plugin.json
+++ b/public/app/plugins/panel/graph2/plugin.json
@@ -2,7 +2,7 @@
   "type": "panel",
   "name": "React Graph",
   "id": "graph2",
-
+  "isDataPanel": true,
   "state": "alpha",
 
   "info": {
diff --git a/public/app/plugins/panel/text2/plugin.json b/public/app/plugins/panel/text2/plugin.json
index 53885dbd0f4..cd4ff424d89 100644
--- a/public/app/plugins/panel/text2/plugin.json
+++ b/public/app/plugins/panel/text2/plugin.json
@@ -2,8 +2,8 @@
   "type": "panel",
   "name": "Text v2",
   "id": "text2",
-
   "state": "alpha",
+  "isDataPanel": false,
 
   "info": {
     "author": {
diff --git a/public/app/types/plugins.ts b/public/app/types/plugins.ts
index 51c3b7b0476..0c5c53eb6f0 100644
--- a/public/app/types/plugins.ts
+++ b/public/app/types/plugins.ts
@@ -9,6 +9,7 @@ export interface PanelPlugin {
   info: any;
   sort: number;
   exports?: PluginExports;
+  isDataPanel?: boolean;
 }
 
 export interface Plugin {