diff --git a/public/app/features/dashboard/submenu/submenu.html b/public/app/features/dashboard/submenu/submenu.html
index eb8de17676c..21a9744b359 100644
--- a/public/app/features/dashboard/submenu/submenu.html
+++ b/public/app/features/dashboard/submenu/submenu.html
@@ -1,6 +1,6 @@
 <div class="submenu-controls">
 	<ul ng-if="ctrl.dashboard.templating.list.length > 0">
-		<li ng-repeat="variable in ctrl.variables" class="submenu-item">
+		<li ng-repeat="variable in ctrl.variables" ng-show="!variable.hideVariable" class="submenu-item">
 			<span class="submenu-item-label template-variable " ng-show="!variable.hideLabel">
 				{{variable.label || variable.name}}:
 			</span>
diff --git a/public/app/features/templating/partials/editor.html b/public/app/features/templating/partials/editor.html
index d3a4e5a8024..1ea99617f1d 100644
--- a/public/app/features/templating/partials/editor.html
+++ b/public/app/features/templating/partials/editor.html
@@ -95,6 +95,7 @@
 					<span class="gf-form-label width-7">Label</span>
 					<input type="text" class="gf-form-input max-width-14" ng-model='current.label' placeholder="optional display name"></input>
 					<editor-checkbox class="width-13" text="Hide label" model="current.hideLabel" change="runQuery()"></editor-checkbox>
+					<editor-checkbox class="width-13" text="Hide variable" model="current.hideVariable" change="runQuery()"></editor-checkbox>
 				</div>
 			</div>