diff --git a/packages/grafana-ui/src/options/builder/text.tsx b/packages/grafana-ui/src/options/builder/text.tsx
index fced7e3a9cd..79ec1bbb8b8 100644
--- a/packages/grafana-ui/src/options/builder/text.tsx
+++ b/packages/grafana-ui/src/options/builder/text.tsx
@@ -5,15 +5,14 @@ import { OptionsWithTextFormatting } from '@grafana/schema';
 /**
  * Adds common text control options to a visualization options
  * @param builder
- * @param withTitle
  * @public
  */
 export function addTextSizeOptions<T extends OptionsWithTextFormatting>(
   builder: PanelOptionsEditorBuilder<T>,
-  withTitle = true
+  options: { withValue?: boolean; withTitle?: boolean; withPercentChange?: boolean }
 ) {
   const category = [t('grafana-ui.builder.text.category-text-size', 'Text size')];
-  if (withTitle) {
+  if (options.withTitle) {
     builder.addNumberInput({
       path: 'text.titleSize',
       category,
@@ -28,29 +27,33 @@ export function addTextSizeOptions<T extends OptionsWithTextFormatting>(
     });
   }
 
-  builder.addNumberInput({
-    path: 'text.valueSize',
-    category,
-    name: t('grafana-ui.builder.text.name-value', 'Value'),
-    settings: {
-      placeholder: t('grafana-ui.builder.text.placeholder-value', 'Auto'),
-      integer: false,
-      min: 1,
-      max: 200,
-    },
-    defaultValue: undefined,
-  });
+  if (options.withValue !== false) {
+    builder.addNumberInput({
+      path: 'text.valueSize',
+      category,
+      name: t('grafana-ui.builder.text.name-value', 'Value'),
+      settings: {
+        placeholder: t('grafana-ui.builder.text.placeholder-value', 'Auto'),
+        integer: false,
+        min: 1,
+        max: 200,
+      },
+      defaultValue: undefined,
+    });
+  }
 
-  builder.addNumberInput({
-    path: 'text.percentSize',
-    category,
-    name: t('grafana-ui.builder.text.name-percent-change', 'Percent change'),
-    settings: {
-      placeholder: t('grafana-ui.builder.text.placeholder-percent-change', 'Auto'),
-      integer: false,
-      min: 1,
-      max: 200,
-    },
-    defaultValue: undefined,
-  });
+  if (options.withPercentChange) {
+    builder.addNumberInput({
+      path: 'text.percentSize',
+      category,
+      name: t('grafana-ui.builder.text.name-percent-change', 'Percent change'),
+      settings: {
+        placeholder: t('grafana-ui.builder.text.placeholder-percent-change', 'Auto'),
+        integer: false,
+        min: 1,
+        max: 200,
+      },
+      defaultValue: undefined,
+    });
+  }
 }
diff --git a/public/app/plugins/panel/barchart/module.tsx b/public/app/plugins/panel/barchart/module.tsx
index 34df5c40933..d4284656595 100644
--- a/public/app/plugins/panel/barchart/module.tsx
+++ b/public/app/plugins/panel/barchart/module.tsx
@@ -255,7 +255,7 @@ export const plugin = new PanelPlugin<Options, FieldConfig>(BarChartPanel)
 
     commonOptionsBuilder.addTooltipOptions(builder, false, false, optsWithHideZeros);
     commonOptionsBuilder.addLegendOptions(builder);
-    commonOptionsBuilder.addTextSizeOptions(builder, false);
+    commonOptionsBuilder.addTextSizeOptions(builder, { withValue: true });
   })
   .setSuggestionsSupplier(new BarChartSuggestionsSupplier());
 
diff --git a/public/app/plugins/panel/bargauge/module.tsx b/public/app/plugins/panel/bargauge/module.tsx
index c04444de809..3e0262fb237 100644
--- a/public/app/plugins/panel/bargauge/module.tsx
+++ b/public/app/plugins/panel/bargauge/module.tsx
@@ -17,7 +17,7 @@ export const plugin = new PanelPlugin<Options>(BarGaugePanel)
     addStandardDataReduceOptions(builder);
     addOrientationOption(builder, category);
     commonOptionsBuilder.addLegendOptions(builder, true, false);
-    commonOptionsBuilder.addTextSizeOptions(builder);
+    commonOptionsBuilder.addTextSizeOptions(builder, { withTitle: true, withValue: true });
 
     builder
       .addRadio({
diff --git a/public/app/plugins/panel/gauge/module.tsx b/public/app/plugins/panel/gauge/module.tsx
index 0dbedaaaaa4..690698534a1 100644
--- a/public/app/plugins/panel/gauge/module.tsx
+++ b/public/app/plugins/panel/gauge/module.tsx
@@ -85,7 +85,7 @@ export const plugin = new PanelPlugin<Options>(GaugePanel)
           options.sizing === BarGaugeSizing.Manual && options.orientation === VizOrientation.Horizontal,
       });
 
-    commonOptionsBuilder.addTextSizeOptions(builder);
+    commonOptionsBuilder.addTextSizeOptions(builder, { withTitle: true, withValue: true });
   })
   .setPanelChangeHandler(gaugePanelChangedHandler)
   .setSuggestionsSupplier(new GaugeSuggestionsSupplier())
diff --git a/public/app/plugins/panel/stat/module.tsx b/public/app/plugins/panel/stat/module.tsx
index 4a22ef382c9..969e010352c 100644
--- a/public/app/plugins/panel/stat/module.tsx
+++ b/public/app/plugins/panel/stat/module.tsx
@@ -22,7 +22,7 @@ export const plugin = new PanelPlugin<Options>(StatPanel)
 
     addStandardDataReduceOptions(builder);
     addOrientationOption(builder, mainCategory);
-    commonOptionsBuilder.addTextSizeOptions(builder);
+    commonOptionsBuilder.addTextSizeOptions(builder, { withTitle: true, withValue: true, withPercentChange: true });
 
     builder
       .addSelect({