diff --git a/src/plugins/data/public/ui/filter_bar/filter_options.tsx b/src/plugins/data/public/ui/filter_bar/filter_options.tsx
index 26fcc9714212..6de37d562ce1 100644
--- a/src/plugins/data/public/ui/filter_bar/filter_options.tsx
+++ b/src/plugins/data/public/ui/filter_bar/filter_options.tsx
@@ -88,8 +88,7 @@ const FilterOptionsUI = (props: Props) => {
   const uiSettings = opensearchDashboards.services.uiSettings;
   const isPinned = uiSettings!.get(UI_SETTINGS.FILTERS_PINNED_BY_DEFAULT);
   const useNewHeader = Boolean(uiSettings!.get(UI_SETTINGS.NEW_HOME_PAGE));
-  const [indexPattern] = props.indexPatterns;
-  const index = indexPattern && indexPattern.id;
+  const index = Array.isArray(props.indexPatterns) ? props.indexPatterns[0]?.id : undefined;
   const newFilter = buildEmptyFilter(isPinned, index);
 
   const togglePopover = () => {
diff --git a/src/plugins/data/public/ui/query_editor/__snapshots__/language_selector.test.tsx.snap b/src/plugins/data/public/ui/query_editor/__snapshots__/language_selector.test.tsx.snap
index 740611ae6d36..68e06485f77c 100644
--- a/src/plugins/data/public/ui/query_editor/__snapshots__/language_selector.test.tsx.snap
+++ b/src/plugins/data/public/ui/query_editor/__snapshots__/language_selector.test.tsx.snap
@@ -508,7 +508,6 @@ exports[`LanguageSelector should select DQL if language is kuery 1`] = `
         <EuiSmallButtonEmpty
           className="languageSelector__button"
           iconSide="right"
-          iconSize="s"
           iconType="arrowDown"
           onClick={[Function]}
         >
@@ -532,14 +531,12 @@ exports[`LanguageSelector should select DQL if language is kuery 1`] = `
           <EuiSmallButtonEmpty
             className="languageSelector__button"
             iconSide="right"
-            iconSize="s"
             iconType="arrowDown"
             onClick={[Function]}
           >
             <EuiButtonEmpty
               className="languageSelector__button"
               iconSide="right"
-              iconSize="s"
               iconType="arrowDown"
               onClick={[Function]}
               size="s"
@@ -547,7 +544,6 @@ exports[`LanguageSelector should select DQL if language is kuery 1`] = `
               <button
                 className="euiButtonEmpty euiButtonEmpty--primary euiButtonEmpty--small languageSelector__button"
                 disabled={false}
-                iconSize="s"
                 onClick={[Function]}
                 type="button"
               >
@@ -1104,7 +1100,6 @@ exports[`LanguageSelector should select lucene if language is lucene 1`] = `
         <EuiSmallButtonEmpty
           className="languageSelector__button"
           iconSide="right"
-          iconSize="s"
           iconType="arrowDown"
           onClick={[Function]}
         >
@@ -1128,14 +1123,12 @@ exports[`LanguageSelector should select lucene if language is lucene 1`] = `
           <EuiSmallButtonEmpty
             className="languageSelector__button"
             iconSide="right"
-            iconSize="s"
             iconType="arrowDown"
             onClick={[Function]}
           >
             <EuiButtonEmpty
               className="languageSelector__button"
               iconSide="right"
-              iconSize="s"
               iconType="arrowDown"
               onClick={[Function]}
               size="s"
@@ -1143,7 +1136,6 @@ exports[`LanguageSelector should select lucene if language is lucene 1`] = `
               <button
                 className="euiButtonEmpty euiButtonEmpty--primary euiButtonEmpty--small languageSelector__button"
                 disabled={false}
-                iconSize="s"
                 onClick={[Function]}
                 type="button"
               >
diff --git a/src/plugins/data/public/ui/query_editor/editors/default_editor/index.tsx b/src/plugins/data/public/ui/query_editor/editors/default_editor/index.tsx
index 1134d104befd..0d76ff0e78f3 100644
--- a/src/plugins/data/public/ui/query_editor/editors/default_editor/index.tsx
+++ b/src/plugins/data/public/ui/query_editor/editors/default_editor/index.tsx
@@ -77,14 +77,22 @@ export const DefaultInput: React.FC<DefaultInputProps> = ({
             gutterSize="none"
             className="defaultEditor__footerRow"
           >
-            {footerItems.start?.map((item) => (
-              <EuiFlexItem grow={false} className="defaultEditor__footerItem">
+            {footerItems.start?.map((item, idx) => (
+              <EuiFlexItem
+                key={`defaultEditor__footerItem-start-${idx}`}
+                grow={false}
+                className="defaultEditor__footerItem"
+              >
                 {item}
               </EuiFlexItem>
             ))}
             <EuiFlexItem grow />
-            {footerItems.end?.map((item) => (
-              <EuiFlexItem grow={false} className="defaultEditor__footerItem">
+            {footerItems.end?.map((item, idx) => (
+              <EuiFlexItem
+                key={`defaultEditor__footerItem-end-${idx}`}
+                grow={false}
+                className="defaultEditor__footerItem"
+              >
                 {item}
               </EuiFlexItem>
             ))}
diff --git a/src/plugins/data/public/ui/query_editor/language_selector.tsx b/src/plugins/data/public/ui/query_editor/language_selector.tsx
index ed7598fea563..6fc0606c1997 100644
--- a/src/plugins/data/public/ui/query_editor/language_selector.tsx
+++ b/src/plugins/data/public/ui/query_editor/language_selector.tsx
@@ -111,7 +111,6 @@ export const QueryLanguageSelector = (props: QueryLanguageSelectorProps) => {
       button={
         <EuiSmallButtonEmpty
           iconSide="right"
-          iconSize="s"
           onClick={onButtonClick}
           className="languageSelector__button"
           iconType="arrowDown"
diff --git a/src/plugins/data/public/ui/search_bar/search_bar.tsx b/src/plugins/data/public/ui/search_bar/search_bar.tsx
index 28f39bf7a23f..35c2065b14c8 100644
--- a/src/plugins/data/public/ui/search_bar/search_bar.tsx
+++ b/src/plugins/data/public/ui/search_bar/search_bar.tsx
@@ -224,7 +224,8 @@ class SearchBarUI extends Component<SearchBarProps, State> {
     const showDatePicker = this.props.showDatePicker || this.props.showAutoRefreshOnly;
     // TODO: MQL showQueryEditor should be a prop of it's own but using showQueryInput for now
     const showQueryEditor =
-      this.props.showQueryInput && this.props.indexPatterns && this.state.query;
+      (this.props.showQueryInput && this.props.indexPatterns && this.state.query) ||
+      this.props.datasetSelectorRef?.current;
     return this.props.showQueryBar && (showDatePicker || showQueryEditor);
   }
 
diff --git a/src/plugins/discover/public/application/components/no_index_patterns/no_index_patterns.scss b/src/plugins/discover/public/application/components/no_index_patterns/no_index_patterns.scss
index fb2d8ef915aa..b435d3b36a6d 100644
--- a/src/plugins/discover/public/application/components/no_index_patterns/no_index_patterns.scss
+++ b/src/plugins/discover/public/application/components/no_index_patterns/no_index_patterns.scss
@@ -4,12 +4,8 @@
  */
 
 .discoverNoIndexPatterns-centerPanel {
-  height: 100%;
   width: 100%;
 
-  // Push the centralized child up, just like ouiOverlayMask
-  padding-bottom: 10vh;
-
   & > * {
     @include euiLegibilityMaxWidth(100%);
   }
diff --git a/src/plugins/discover/public/application/view_components/canvas/index.tsx b/src/plugins/discover/public/application/view_components/canvas/index.tsx
index b118df817ab0..cf834888b4f0 100644
--- a/src/plugins/discover/public/application/view_components/canvas/index.tsx
+++ b/src/plugins/discover/public/application/view_components/canvas/index.tsx
@@ -4,7 +4,7 @@
  */
 
 import React, { useEffect, useState, useRef, useCallback } from 'react';
-import { EuiPanel } from '@elastic/eui';
+import { EuiPanel, EuiSpacer } from '@elastic/eui';
 import { TopNav } from './top_nav';
 import { ViewProps } from '../../../../../data_explorer/public';
 import { DiscoverTable } from './discover_table';
@@ -143,41 +143,47 @@ export default function DiscoverCanvas({ setHeaderActionMenu, history, optionalR
         showSaveQuery={showSaveQuery}
       />
 
-      {!indexPattern && <DiscoverNoIndexPatterns />}
-      <>
-        {fetchState.status === ResultStatus.NO_RESULTS && (
-          <DiscoverNoResults
-            queryString={data.query.queryString}
-            query={data.query.queryString.getQuery()}
-            savedQuery={data.query.savedQueries}
-            timeFieldName={timeField}
-          />
-        )}
-        {fetchState.status === ResultStatus.ERROR && (
-          <DiscoverNoResults
-            queryString={data.query.queryString}
-            query={data.query.queryString.getQuery()}
-            savedQuery={data.query.savedQueries}
-            timeFieldName={timeField}
-          />
-        )}
-        {fetchState.status === ResultStatus.UNINITIALIZED && (
-          <DiscoverUninitialized onRefresh={() => refetch$.next()} />
-        )}
-        {fetchState.status === ResultStatus.LOADING && <LoadingSpinner />}
-        {fetchState.status === ResultStatus.READY && isEnhancementsEnabled && (
-          <>
-            <MemoizedDiscoverChartContainer {...fetchState} />
-            <MemoizedDiscoverTable rows={rows} scrollToTop={scrollToTop} />
-          </>
-        )}
-        {fetchState.status === ResultStatus.READY && !isEnhancementsEnabled && (
-          <EuiPanel hasShadow={false} paddingSize="none" className="dscCanvas_results">
-            <MemoizedDiscoverChartContainer {...fetchState} />
-            <MemoizedDiscoverTable rows={rows} scrollToTop={scrollToTop} />
-          </EuiPanel>
-        )}
-      </>
+      {indexPattern ? (
+        <>
+          {fetchState.status === ResultStatus.NO_RESULTS && (
+            <DiscoverNoResults
+              queryString={data.query.queryString}
+              query={data.query.queryString.getQuery()}
+              savedQuery={data.query.savedQueries}
+              timeFieldName={timeField}
+            />
+          )}
+          {fetchState.status === ResultStatus.ERROR && (
+            <DiscoverNoResults
+              queryString={data.query.queryString}
+              query={data.query.queryString.getQuery()}
+              savedQuery={data.query.savedQueries}
+              timeFieldName={timeField}
+            />
+          )}
+          {fetchState.status === ResultStatus.UNINITIALIZED && (
+            <DiscoverUninitialized onRefresh={() => refetch$.next()} />
+          )}
+          {fetchState.status === ResultStatus.LOADING && <LoadingSpinner />}
+          {fetchState.status === ResultStatus.READY && isEnhancementsEnabled && (
+            <>
+              <MemoizedDiscoverChartContainer {...fetchState} />
+              <MemoizedDiscoverTable rows={rows} scrollToTop={scrollToTop} />
+            </>
+          )}
+          {fetchState.status === ResultStatus.READY && !isEnhancementsEnabled && (
+            <EuiPanel hasShadow={false} paddingSize="none" className="dscCanvas_results">
+              <MemoizedDiscoverChartContainer {...fetchState} />
+              <MemoizedDiscoverTable rows={rows} scrollToTop={scrollToTop} />
+            </EuiPanel>
+          )}
+        </>
+      ) : (
+        <>
+          <EuiSpacer size="xxl" />
+          <DiscoverNoIndexPatterns />
+        </>
+      )}
     </EuiPanel>
   );
 }
diff --git a/src/plugins/discover/public/application/view_components/canvas/top_nav.tsx b/src/plugins/discover/public/application/view_components/canvas/top_nav.tsx
index a4054535ddf5..6f827e563ec6 100644
--- a/src/plugins/discover/public/application/view_components/canvas/top_nav.tsx
+++ b/src/plugins/discover/public/application/view_components/canvas/top_nav.tsx
@@ -171,6 +171,7 @@ export const TopNav = ({ opts, showSaveQuery, isEnhancementsEnabled }: TopNavPro
         groupActions={showActionsInGroup}
         screenTitle={screenTitle}
         queryStatus={queryStatus}
+        showQueryBar={!!opts?.optionalRef?.datasetSelectorRef}
       />
     </>
   );