diff --git a/public/app/features/dashboard/components/AddPanelWidget/AddPanelWidget.tsx b/public/app/features/dashboard/components/AddPanelWidget/AddPanelWidget.tsx
index 7a9767666c0..b3d5e6167c4 100644
--- a/public/app/features/dashboard/components/AddPanelWidget/AddPanelWidget.tsx
+++ b/public/app/features/dashboard/components/AddPanelWidget/AddPanelWidget.tsx
@@ -62,20 +62,21 @@ export class AddPanelWidget extends React.Component<Props, State> {
     );
   }
 
-  moveToEdit(panel) {
+  moveToEdit(panel, tab) {
     reduxStore.dispatch(
       updateLocation({
         query: {
           panelId: panel.id,
           edit: true,
           fullscreen: true,
+          tab: tab,
         },
         partial: true,
       })
     );
   }
 
-  onCreateNewPanel = () => {
+  onCreateNewPanel = (tab = 'queries') => {
     const dashboard = this.props.dashboard;
     const { gridPos } = this.props.panel;
 
@@ -88,7 +89,7 @@ export class AddPanelWidget extends React.Component<Props, State> {
     dashboard.addPanel(newPanel);
     dashboard.removePanel(this.props.panel);
 
-    this.moveToEdit(newPanel);
+    this.moveToEdit(newPanel, tab);
   };
 
   onPasteCopiedPanel = panelPluginInfo => {
@@ -150,7 +151,7 @@ export class AddPanelWidget extends React.Component<Props, State> {
           </div>
           <div className="add-panel-widget__btn-container">
             {this.renderOptionLink('queries', 'Add query', this.onCreateNewPanel)}
-            {this.renderOptionLink('visualization', 'Choose Panel type', this.onCreateNewPanel)}
+            {this.renderOptionLink('visualization', 'Choose Panel type', () => this.onCreateNewPanel('visualization'))}
             {this.renderOptionLink('queries', 'Convert to row', this.onCreateNewRow)}
           </div>
         </div>
diff --git a/public/app/features/dashboard/panel_editor/VisualizationTab.tsx b/public/app/features/dashboard/panel_editor/VisualizationTab.tsx
index 35b9b71112a..fdf978acdf9 100644
--- a/public/app/features/dashboard/panel_editor/VisualizationTab.tsx
+++ b/public/app/features/dashboard/panel_editor/VisualizationTab.tsx
@@ -3,6 +3,7 @@ import React, { PureComponent } from 'react';
 
 // Utils & Services
 import { AngularComponent, getAngularLoader } from 'app/core/services/AngularLoader';
+//TODO: See PanelEdit
 
 // Components
 import { EditorTabBody, EditorToolbarView } from './EditorTabBody';