diff --git a/public/app/features/dashboard/components/PanelEditor/getVizualizationOptions.tsx b/public/app/features/dashboard/components/PanelEditor/getVizualizationOptions.tsx
index 0600f143b4a..cce260e7393 100644
--- a/public/app/features/dashboard/components/PanelEditor/getVizualizationOptions.tsx
+++ b/public/app/features/dashboard/components/PanelEditor/getVizualizationOptions.tsx
@@ -41,6 +41,10 @@ export function getVizualizationOptions(props: OptionPaneRenderProps): OptionsPa
    * Panel options
    */
   for (const pluginOption of plugin.optionEditors.list()) {
+    if (pluginOption.showIf && !pluginOption.showIf(currentOptions, data?.series)) {
+      continue;
+    }
+
     const category = getOptionsPaneCategory(pluginOption.category);
     const Editor = pluginOption.editor;
 
diff --git a/public/app/features/dashboard/state/PanelModel.ts b/public/app/features/dashboard/state/PanelModel.ts
index 52008c4bde6..0e757bcdbd8 100644
--- a/public/app/features/dashboard/state/PanelModel.ts
+++ b/public/app/features/dashboard/state/PanelModel.ts
@@ -105,6 +105,7 @@ const mustKeepProps: { [str: string]: boolean } = {
   replaceVariables: true,
   libraryPanel: true,
   getDisplayTitle: true,
+  configRev: true,
 };
 
 const defaults: any = {