diff --git a/public/app/features/dashboard/components/AddPanelWidget/AddPanelWidget.tsx b/public/app/features/dashboard/components/AddPanelWidget/AddPanelWidget.tsx
index b3d5e6167c4..21c4451d9b9 100644
--- a/public/app/features/dashboard/components/AddPanelWidget/AddPanelWidget.tsx
+++ b/public/app/features/dashboard/components/AddPanelWidget/AddPanelWidget.tsx
@@ -17,6 +17,17 @@ export interface State {
   copiedPanelPlugins: any[];
 }
 
+type Location = {
+  query: {
+    panelId: number;
+    edit: boolean;
+    fullscreen: boolean;
+    tab?: string;
+    isVizPickerOpen?: boolean;
+  };
+  partial: boolean;
+};
+
 export class AddPanelWidget extends React.Component<Props, State> {
   constructor(props) {
     super(props);
@@ -62,18 +73,8 @@ export class AddPanelWidget extends React.Component<Props, State> {
     );
   }
 
-  moveToEdit(panel, tab) {
-    reduxStore.dispatch(
-      updateLocation({
-        query: {
-          panelId: panel.id,
-          edit: true,
-          fullscreen: true,
-          tab: tab,
-        },
-        partial: true,
-      })
-    );
+  moveToEdit(location) {
+    reduxStore.dispatch(updateLocation(location));
   }
 
   onCreateNewPanel = (tab = 'queries') => {
@@ -89,7 +90,28 @@ export class AddPanelWidget extends React.Component<Props, State> {
     dashboard.addPanel(newPanel);
     dashboard.removePanel(this.props.panel);
 
-    this.moveToEdit(newPanel, tab);
+    let location: Location = {
+      query: {
+        panelId: newPanel.id,
+        edit: true,
+        fullscreen: true,
+      },
+      partial: true,
+    };
+
+    if (tab === 'visualization') {
+      location = {
+        ...location,
+        query: {
+          ...location.query,
+          tab: 'visualization',
+          isVizPickerOpen: true,
+        },
+      };
+      this.moveToEdit(location);
+    } else {
+      this.moveToEdit(location);
+    }
   };
 
   onPasteCopiedPanel = panelPluginInfo => {
diff --git a/public/app/features/dashboard/panel_editor/VisualizationTab.tsx b/public/app/features/dashboard/panel_editor/VisualizationTab.tsx
index fdf978acdf9..1ca290d4051 100644
--- a/public/app/features/dashboard/panel_editor/VisualizationTab.tsx
+++ b/public/app/features/dashboard/panel_editor/VisualizationTab.tsx
@@ -3,7 +3,7 @@ import React, { PureComponent } from 'react';
 
 // Utils & Services
 import { AngularComponent, getAngularLoader } from 'app/core/services/AngularLoader';
-//TODO: See PanelEdit
+import { store } from 'app/store/store';
 
 // Components
 import { EditorTabBody, EditorToolbarView } from './EditorTabBody';
@@ -39,7 +39,7 @@ export class VisualizationTab extends PureComponent<Props, State> {
     super(props);
 
     this.state = {
-      isVizPickerOpen: false,
+      isVizPickerOpen: store.getState().location.query.isVizPickerOpen === true,
       searchQuery: '',
       scrollTop: 0,
     };