diff --git a/pkg/api/frontendsettings.go b/pkg/api/frontendsettings.go
index 37c663bf7ee..c430e75b9c7 100644
--- a/pkg/api/frontendsettings.go
+++ b/pkg/api/frontendsettings.go
@@ -285,16 +285,18 @@ func getPanelSort(id string) int {
 		sort = 10
 	case "status-grid":
 		sort = 11
-	case "graph":
+	case "histogram":
 		sort = 12
-	case "text":
+	case "graph":
 		sort = 13
-	case "alertlist":
+	case "text":
 		sort = 14
-	case "dashlist":
+	case "alertlist":
 		sort = 15
-	case "news":
+	case "dashlist":
 		sort = 16
+	case "news":
+		sort = 17
 	}
 	return sort
 }
diff --git a/public/app/features/dashboard/components/PanelEditor/VisualizationSelectPane.tsx b/public/app/features/dashboard/components/PanelEditor/VisualizationSelectPane.tsx
index 6bdbef91b4a..a5dd75d7e8f 100644
--- a/public/app/features/dashboard/components/PanelEditor/VisualizationSelectPane.tsx
+++ b/public/app/features/dashboard/components/PanelEditor/VisualizationSelectPane.tsx
@@ -57,7 +57,7 @@ export const VisualizationSelectPane: FC<Props> = ({ panel }) => {
         const match = filterPluginList(plugins, query, plugin.meta);
 
         if (match && match.length) {
-          onPluginTypeChange(match[0], true);
+          onPluginTypeChange(match[0], false);
         }
       }
     },
diff --git a/public/app/plugins/panel/histogram/Histogram.tsx b/public/app/plugins/panel/histogram/Histogram.tsx
index 16bfccc3199..f8dfe3776d6 100644
--- a/public/app/plugins/panel/histogram/Histogram.tsx
+++ b/public/app/plugins/panel/histogram/Histogram.tsx
@@ -123,7 +123,8 @@ const prepConfig = (frame: DataFrame, theme: GrafanaTheme2) => {
   for (let i = 2; i < frame.fields.length; i++) {
     const field = frame.fields[i];
 
-    field.state!.seriesIndex = seriesIndex++;
+    field.state = field.state ?? {};
+    field.state.seriesIndex = seriesIndex++;
 
     const customConfig = { ...field.config.custom };