From 85e3ed491dd4692bd70cc2dfc4a8c2ed6d8125eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.com>
Date: Wed, 12 Oct 2022 12:00:45 +0200
Subject: [PATCH] DashboardsList: Fix height issue in topnav (#56661)

---
 public/app/core/components/PageNew/PageContents.tsx         | 6 ++++--
 public/app/features/search/components/DashboardListPage.tsx | 1 +
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/public/app/core/components/PageNew/PageContents.tsx b/public/app/core/components/PageNew/PageContents.tsx
index 85a04fa295a..81f60408e8d 100644
--- a/public/app/core/components/PageNew/PageContents.tsx
+++ b/public/app/core/components/PageNew/PageContents.tsx
@@ -9,6 +9,8 @@ interface Props {
   className?: string;
 }
 
-export const PageContents: FC<Props> = ({ isLoading, children }) => {
-  return <>{isLoading ? <PageLoader /> : children}</>;
+export const PageContents: FC<Props> = ({ isLoading, children, className }) => {
+  let content = className ? <div className={className}>{children}</div> : children;
+
+  return <>{isLoading ? <PageLoader /> : content}</>;
 };
diff --git a/public/app/features/search/components/DashboardListPage.tsx b/public/app/features/search/components/DashboardListPage.tsx
index 20e64b5d93d..1773d934645 100644
--- a/public/app/features/search/components/DashboardListPage.tsx
+++ b/public/app/features/search/components/DashboardListPage.tsx
@@ -45,6 +45,7 @@ export const DashboardListPage: FC<Props> = memo(({ match, location }) => {
         className={css`
           display: flex;
           flex-direction: column;
+          height: 100%;
           overflow: hidden;
         `}
       >