diff --git a/app/components/shared/Layout.jsx b/app/components/shared/Layout.jsx
index 63b95013..3d95e93f 100644
--- a/app/components/shared/Layout.jsx
+++ b/app/components/shared/Layout.jsx
@@ -11,14 +11,14 @@ const AppWrapperStyle = styled.div`
 `;
 
 const AppMainContentStyle = styled.div`
-  overflow: scroll;
+  overflow: auto;
   width: 100%;
   height: 100%;
   background: #f9fafa;
 `;
 
 const PageWrapperStyle = styled.div`
-  overflow: scroll;
+  overflow: auto;
   display: flex;
   flex-direction: column;
   height: 100%;
diff --git a/modal/Dialog.jsx b/modal/Dialog.jsx
index 8c89ac4a..19b58c64 100644
--- a/modal/Dialog.jsx
+++ b/modal/Dialog.jsx
@@ -72,7 +72,7 @@ const Message = styled.p`
   margin: 0;
   width: 100%;
   height: 100%;
-  overflow: scroll;
+  overflow: auto;
 `;
 
 const Actions = styled.div`
diff --git a/preview/containers/MainContent.jsx b/preview/containers/MainContent.jsx
index 44a6b600..6f20684a 100644
--- a/preview/containers/MainContent.jsx
+++ b/preview/containers/MainContent.jsx
@@ -10,7 +10,7 @@ const Wrapper = styled.div`
   width: 100%;
   align-items: flex-start;
   justify-content: center;
-  overflow: scroll;
+  overflow: auto;
   padding-top: 30px;
 `;
 
diff --git a/static/css/layout.css b/static/css/layout.css
index cf34ddc3..2d793444 100644
--- a/static/css/layout.css
+++ b/static/css/layout.css
@@ -74,7 +74,7 @@
 .mainContentWrapper {
   /* padding-top: 40px; */
   width: 100%;
-  overflow: scroll;
+  overflow: auto;
 }
 
 /* Utilities */
diff --git a/tour/components/Slide.jsx b/tour/components/Slide.jsx
index 72fae983..717d4aeb 100644
--- a/tour/components/Slide.jsx
+++ b/tour/components/Slide.jsx
@@ -5,6 +5,7 @@ import styled from 'styled-components';
 
 const Wrapper = styled.div`
   height: 100%;
+  overflow: hidden;
   display: flex;
   align-items: center;
   flex-direction: column;