diff --git a/public/app/features/dashboard/dashgrid/DataSourcePicker.tsx b/public/app/features/dashboard/dashgrid/DataSourcePicker.tsx
index cd2856dbb91..a4368170b12 100644
--- a/public/app/features/dashboard/dashgrid/DataSourcePicker.tsx
+++ b/public/app/features/dashboard/dashgrid/DataSourcePicker.tsx
@@ -15,9 +15,15 @@ export interface Props {
   onChangeDataSource: (ds: DataSourceSelectItem) => void;
   datasources: DataSourceSelectItem[];
   current: DataSourceSelectItem;
+  onBlur?: () => void;
+  autoFocus?: boolean;
 }
 
 export class DataSourcePicker extends PureComponent<Props> {
+  static defaultProps = {
+    autoFocus: false,
+  };
+
   searchInput: HTMLElement;
 
   constructor(props) {
@@ -30,7 +36,7 @@ export class DataSourcePicker extends PureComponent<Props> {
   };
 
   render() {
-    const { datasources, current, onChangeDatasource } = this.props;
+    const { datasources, current, autoFocus, onBlur } = this.props;
 
     const options = datasources.map(ds => ({
       value: ds.name,
@@ -38,7 +44,7 @@ export class DataSourcePicker extends PureComponent<Props> {
       imgUrl: ds.meta.info.logos.small,
     }));
 
-    const value = {
+    const value = current && {
       label: current.name,
       value: current.name,
       imgUrl: current.meta.info.logos.small,
@@ -55,6 +61,9 @@ export class DataSourcePicker extends PureComponent<Props> {
           onChange={item => this.onChange(item)}
           options={options}
           styles={ResetStyles}
+          autoFocus={autoFocus}
+          onBlur={onBlur}
+          openMenuOnFocus={true}
           maxMenuHeight={500}
           placeholder="Select datasource"
           loadingMessage={() => 'Loading datasources...'}
diff --git a/public/app/features/dashboard/dashgrid/EditorTabBody.tsx b/public/app/features/dashboard/dashgrid/EditorTabBody.tsx
index 89e3049039e..0603139ff65 100644
--- a/public/app/features/dashboard/dashgrid/EditorTabBody.tsx
+++ b/public/app/features/dashboard/dashgrid/EditorTabBody.tsx
@@ -15,7 +15,7 @@ export interface EditorToolBarView {
   icon?: string;
   disabled?: boolean;
   onClick?: () => void;
-  render: (closeFunction: any) => JSX.Element | JSX.Element[];
+  render: (closeFunction?: any) => JSX.Element | JSX.Element[];
 }
 
 interface State {
diff --git a/public/app/features/dashboard/dashgrid/QueriesTab.tsx b/public/app/features/dashboard/dashgrid/QueriesTab.tsx
index b23a444a92d..a01914327ef 100644
--- a/public/app/features/dashboard/dashgrid/QueriesTab.tsx
+++ b/public/app/features/dashboard/dashgrid/QueriesTab.tsx
@@ -30,9 +30,10 @@ interface Props {
 
 interface State {
   currentDS: DataSourceSelectItem;
-  helpContent: JSX.Element | string;
+  helpContent: JSX.Element;
   isLoadingHelp: boolean;
   isPickerOpen: boolean;
+  isAddingMixed: boolean;
 }
 
 interface LoadingPlaceholderProps {
@@ -56,6 +57,7 @@ export class QueriesTab extends PureComponent<Props, State> {
       isLoadingHelp: false,
       helpContent: null,
       isPickerOpen: false,
+      isAddingMixed: false,
     };
   }
 
@@ -132,7 +134,7 @@ export class QueriesTab extends PureComponent<Props, State> {
 
     if (hasHelp) {
       this.setState({
-        helpContent: <h2>Loading help...</h2>,
+        helpContent: <h3>Loading help...</h3>,
         isLoadingHelp: true,
       });
 
@@ -148,7 +150,7 @@ export class QueriesTab extends PureComponent<Props, State> {
         })
         .catch(() => {
           this.setState({
-            helpContent: 'Error occured when loading help',
+            helpContent: <h3>'Error occured when loading help'</h3>,
             isLoadingHelp: false,
           });
         });
@@ -240,6 +242,11 @@ export class QueriesTab extends PureComponent<Props, State> {
   };
 
   onAddQueryClick = () => {
+    if (this.state.currentDS.meta.mixed) {
+      this.setState({ isAddingMixed: true })
+      return;
+    }
+
     this.props.panel.addQuery();
     this.component.digest();
     this.forceUpdate();
@@ -276,9 +283,32 @@ export class QueriesTab extends PureComponent<Props, State> {
     );
   };
 
+  renderMixedPicker = () => {
+    const { currentDS } = this.state;
+
+    return (
+      <DataSourcePicker
+        datasources={this.datasources}
+        onChangeDataSource={this.onAddMixedQuery}
+        current={null}
+        autoFocus={true}
+        onBlur={this.onMixedPickerBlur}
+      />
+    );
+  };
+
+  onAddMixedQuery = datasource => {
+    this.onAddQuery({ datasource: datasource.name });
+    this.setState({ isAddingMixed: false });
+  };
+
+  onMixedPickerBlur = () => {
+    this.setState({ isAddingMixed: false });
+  };
+
   render() {
     const { panel } = this.props;
-    const { currentDS } = this.state;
+    const { currentDS, isAddingMixed } = this.state;
     const { hasQueryHelp } = currentDS.meta;
 
     const queryInspector = {
@@ -318,9 +348,8 @@ export class QueriesTab extends PureComponent<Props, State> {
                 </span>
                 <span className="gf-form-query-letter-cell-letter">{panel.getNextQueryLetter()}</span>
               </label>
-              <button className="btn btn-secondary gf-form-btn" onClick={this.onAddQueryClick}>
-                Add Query
-              </button>
+              {!isAddingMixed && <button className="btn btn-secondary gf-form-btn" onClick={this.onAddQueryClick}>Add Query</button>}
+              {isAddingMixed && this.renderMixedPicker()}
             </div>
           </div>
         </div>
diff --git a/public/sass/components/_form_select_box.scss b/public/sass/components/_form_select_box.scss
index c2735c5395d..3b36df5048e 100644
--- a/public/sass/components/_form_select_box.scss
+++ b/public/sass/components/_form_select_box.scss
@@ -169,6 +169,6 @@ $select-input-bg-disabled: $input-bg-disabled;
 }
 
 .gf-form-select-box__desc-option__img {
-  width: 20px;
+  width: 16px;
   margin-right: 10px;
 }