diff --git a/superset-frontend/src/explore/components/ControlPanelsContainer.jsx b/superset-frontend/src/explore/components/ControlPanelsContainer.jsx
index eeb3ce48af..0624e0a1d0 100644
--- a/superset-frontend/src/explore/components/ControlPanelsContainer.jsx
+++ b/superset-frontend/src/explore/components/ControlPanelsContainer.jsx
@@ -45,6 +45,7 @@ const propTypes = {
 const Styles = styled.div`
   height: 100%;
   max-height: 100%;
+  overflow: auto;
   .remove-alert {
     cursor: pointer;
   }
diff --git a/superset-frontend/src/explore/components/ExploreViewContainer.jsx b/superset-frontend/src/explore/components/ExploreViewContainer.jsx
index 7b49e49a84..fd6d1e00b3 100644
--- a/superset-frontend/src/explore/components/ExploreViewContainer.jsx
+++ b/superset-frontend/src/explore/components/ExploreViewContainer.jsx
@@ -59,7 +59,6 @@ const propTypes = {
 const Styles = styled.div`
   height: ${({ height }) => height};
   min-height: ${({ height }) => height};
-  overflow: hidden;
   text-align: left;
   position: relative;
   width: 100%;
diff --git a/superset-frontend/src/explore/components/QueryAndSaveBtns.jsx b/superset-frontend/src/explore/components/QueryAndSaveBtns.jsx
index e9d447cf90..25a51a59d7 100644
--- a/superset-frontend/src/explore/components/QueryAndSaveBtns.jsx
+++ b/superset-frontend/src/explore/components/QueryAndSaveBtns.jsx
@@ -54,6 +54,7 @@ const getHotKeys = () =>
 
 const Styles = styled.div`
   display: flex;
+  flex-shrink: 0;
   flex-direction: row;
   align-items: center;
   padding-bottom: ${({ theme }) => 2 * theme.gridUnit}px;