diff --git a/src/components/ControlBar/ViewControlBar/ShowMoreButton.js b/src/components/ControlBar/ViewControlBar/ShowMoreButton.js
index d57798480..89b94c6ee 100644
--- a/src/components/ControlBar/ViewControlBar/ShowMoreButton.js
+++ b/src/components/ControlBar/ViewControlBar/ShowMoreButton.js
@@ -35,7 +35,12 @@ const ShowMoreButton = ({ onClick, dashboardBarIsExpanded, disabled }) => {
                     <ChevronDown />
                 </div>
             ) : (
-                <Tooltip content={buttonLabel} placement="bottom">
+                <Tooltip
+                    content={buttonLabel}
+                    placement="top"
+                    openDelay={500}
+                    closeDelay={0}
+                >
                     {({ onMouseOver, onMouseOut, ref }) => (
                         <button
                             className={classes.showMore}
diff --git a/src/components/ControlBar/ViewControlBar/styles/DashboardsBar.module.css b/src/components/ControlBar/ViewControlBar/styles/DashboardsBar.module.css
index 80c017da7..6cc0a6895 100644
--- a/src/components/ControlBar/ViewControlBar/styles/DashboardsBar.module.css
+++ b/src/components/ControlBar/ViewControlBar/styles/DashboardsBar.module.css
@@ -24,7 +24,7 @@
 
 .expanded .container {
     height: var(--max-rows-height);
-    z-index: 2001;
+    z-index: 1999;
 }
 
 .spacer {
diff --git a/src/components/Dashboard/ViewDashboard.js b/src/components/Dashboard/ViewDashboard.js
index 00359a692..4dcd8c431 100644
--- a/src/components/Dashboard/ViewDashboard.js
+++ b/src/components/Dashboard/ViewDashboard.js
@@ -1,7 +1,6 @@
 import React, { useState, useEffect } from 'react'
 import { connect } from 'react-redux'
 import PropTypes from 'prop-types'
-import { ComponentCover } from '@dhis2/ui'
 import cx from 'classnames'
 import DashboardContainer from './DashboardContainer'
 import ViewTitleBar from '../TitleBar/ViewTitleBar'
@@ -62,9 +61,8 @@ export const ViewDashboard = props => {
             />
             <DashboardContainer covered={controlbarExpanded}>
                 {controlbarExpanded && (
-                    <ComponentCover
+                    <div
                         className={classes.cover}
-                        translucent
                         onClick={() => setControlbarExpanded(false)}
                     />
                 )}
diff --git a/src/components/Dashboard/styles/ViewDashboard.module.css b/src/components/Dashboard/styles/ViewDashboard.module.css
index 755062155..c1fe2622a 100644
--- a/src/components/Dashboard/styles/ViewDashboard.module.css
+++ b/src/components/Dashboard/styles/ViewDashboard.module.css
@@ -6,6 +6,13 @@
 }
 
 .cover {
+    position: absolute;
+    top: 0;
+    right: 0;
+    bottom: 0;
+    left: 0;
+    z-index: 1998;
+    background: rgba(33, 43, 54, 0.4);
     display: none;
 }