diff --git a/src/plugins/discover/public/application/apps/main/components/layout/discover_layout.tsx b/src/plugins/discover/public/application/apps/main/components/layout/discover_layout.tsx
index ce987e2870466..0430614d413b6 100644
--- a/src/plugins/discover/public/application/apps/main/components/layout/discover_layout.tsx
+++ b/src/plugins/discover/public/application/apps/main/components/layout/discover_layout.tsx
@@ -346,6 +346,7 @@ export function DiscoverLayout({
                 verticalPosition={contentCentered ? 'center' : undefined}
                 horizontalPosition={contentCentered ? 'center' : undefined}
                 paddingSize="none"
+                hasShadow={false}
                 className={classNames('dscPageContent', {
                   'dscPageContent--centered': contentCentered,
                 })}
diff --git a/x-pack/plugins/graph/public/angular/templates/listing_ng_wrapper.html b/x-pack/plugins/graph/public/angular/templates/listing_ng_wrapper.html
index 4e0c13442d267..b2363ffbaa641 100644
--- a/x-pack/plugins/graph/public/angular/templates/listing_ng_wrapper.html
+++ b/x-pack/plugins/graph/public/angular/templates/listing_ng_wrapper.html
@@ -9,4 +9,5 @@
   initial-filter="initialFilter"
   initialPageSize="initialPageSize"
   core-start="coreStart"
+  class="kbnAppWrapper"
 ></graph-listing>
diff --git a/x-pack/plugins/graph/public/components/guidance_panel/guidance_panel.tsx b/x-pack/plugins/graph/public/components/guidance_panel/guidance_panel.tsx
index 6c2c79baafe0a..7fa63404a4abd 100644
--- a/x-pack/plugins/graph/public/components/guidance_panel/guidance_panel.tsx
+++ b/x-pack/plugins/graph/public/components/guidance_panel/guidance_panel.tsx
@@ -86,8 +86,8 @@ function GuidancePanelComponent(props: GuidancePanelProps) {
 
   const kibana = useKibana<IDataPluginServices>();
   const { services, overlays } = kibana;
-  const { savedObjects, uiSettings, chrome, application } = services;
-  if (!overlays || !chrome || !application) return null;
+  const { savedObjects, uiSettings, application } = services;
+  if (!overlays || !application) return null;
 
   const onOpenDatasourcePicker = () => {
     openSourceModal({ overlays, savedObjects, uiSettings }, onIndexPatternSelected);
@@ -149,8 +149,9 @@ function GuidancePanelComponent(props: GuidancePanelProps) {
   );
 
   if (noIndexPatterns) {
-    const managementUrl = chrome.navLinks.get('kibana:stack_management')!.url;
-    const indexPatternUrl = `${managementUrl}/kibana/indexPatterns`;
+    const indexPatternUrl = application.getUrlForApp('management', {
+      path: '/kibana/indexPatterns',
+    });
     const sampleDataUrl = `${application.getUrlForApp('home')}#/tutorial_directory/sampleData`;
     content = (
       <EuiPanel paddingSize="none">