diff --git a/src/legacy/core_plugins/kibana/public/dashboard/listing/__snapshots__/dashboard_listing.test.js.snap b/src/legacy/core_plugins/kibana/public/dashboard/listing/__snapshots__/dashboard_listing.test.js.snap
index efdc9de5c3b3f..6a15f580e81d5 100644
--- a/src/legacy/core_plugins/kibana/public/dashboard/listing/__snapshots__/dashboard_listing.test.js.snap
+++ b/src/legacy/core_plugins/kibana/public/dashboard/listing/__snapshots__/dashboard_listing.test.js.snap
@@ -83,7 +83,7 @@ exports[`after fetch initialFilter 1`] = `
             <EuiButton
               color="primary"
               data-test-subj="newDashboardLink"
-              fill={false}
+              fill={true}
               href="#/dashboard"
               iconSide="left"
               type="button"
@@ -333,7 +333,7 @@ exports[`after fetch renders table rows 1`] = `
             <EuiButton
               color="primary"
               data-test-subj="newDashboardLink"
-              fill={false}
+              fill={true}
               href="#/dashboard"
               iconSide="left"
               type="button"
@@ -501,7 +501,7 @@ exports[`after fetch renders warning when listingLimit is exceeded 1`] = `
             <EuiButton
               color="primary"
               data-test-subj="newDashboardLink"
-              fill={false}
+              fill={true}
               href="#/dashboard"
               iconSide="left"
               type="button"
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/listing/dashboard_listing.js b/src/legacy/core_plugins/kibana/public/dashboard/listing/dashboard_listing.js
index 1d7a68968015e..67a12b4a251bc 100644
--- a/src/legacy/core_plugins/kibana/public/dashboard/listing/dashboard_listing.js
+++ b/src/legacy/core_plugins/kibana/public/dashboard/listing/dashboard_listing.js
@@ -522,6 +522,7 @@ class DashboardListingUi extends React.Component {
           <EuiButton
             href={`#${DashboardConstants.CREATE_NEW_DASHBOARD_URL}`}
             data-test-subj="newDashboardLink"
+            fill
           >
             <FormattedMessage
               id="kbn.dashboard.listing.createNewDashboardButtonLabel"
diff --git a/x-pack/plugins/gis/public/_main.scss b/x-pack/plugins/gis/public/_main.scss
index 9aaf01687742a..fe4853ebc29cf 100644
--- a/x-pack/plugins/gis/public/_main.scss
+++ b/x-pack/plugins/gis/public/_main.scss
@@ -1,5 +1,8 @@
-
-
+// Makes sure the listing page is full height with proper background
+map-listing, .gisListingPage {
+  display: flex;
+  flex-grow: 1;
+}
 
 
 #gis-plugin {
diff --git a/x-pack/plugins/gis/public/shared/components/map_listing.js b/x-pack/plugins/gis/public/shared/components/map_listing.js
index 32e6df7596a92..4e38bbbc4c047 100644
--- a/x-pack/plugins/gis/public/shared/components/map_listing.js
+++ b/x-pack/plugins/gis/public/shared/components/map_listing.js
@@ -322,6 +322,7 @@ export class MapListing extends React.Component {
           <EuiButton
             href={`#/map`}
             data-test-subj="newMapLink"
+            fill
           >
             Create new map
           </EuiButton>
@@ -372,8 +373,8 @@ export class MapListing extends React.Component {
 
   render() {
     return (
-      <EuiPage data-test-subj="gisListingPage" restrictWidth>
-        <EuiPageBody>
+      <EuiPage data-test-subj="gisListingPage" className="gisListingPage">
+        <EuiPageBody restrictWidth>
           {this.renderPageContent()}
         </EuiPageBody>
       </EuiPage>