diff --git a/CHANGELOG.md b/CHANGELOG.md
index 69c92d9..840c663 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+### Fixed
+- Use `overflow-y-auto` instead of `overflow-y-scroll`.
 
 ## [1.3.1] - 2019-11-27
 ### Fixed
diff --git a/react/PageLayoutContainer.tsx b/react/PageLayoutContainer.tsx
index ea82b44..7a1e8f7 100644
--- a/react/PageLayoutContainer.tsx
+++ b/react/PageLayoutContainer.tsx
@@ -20,13 +20,13 @@ const PageLayoutContainer: FC = ({ children }) => {
       <div className="flex flex-row-l flex-column vh-100-l">
         <EnhancedSideBarContentProvider>
           <div
-            className="w-25-l vh-100-l overflow-y-scroll"
+            className="w-25-l vh-100-l overflow-y-auto"
             style={{ maxWidth: '280px', minWidth: '200px' }}>
             <SideBar />
           </div>
         </EnhancedSideBarContentProvider>
         <div
-          className="w-100 min-vh-100 overflow-y-scroll flex flex-column justify-between"
+          className="w-100 min-vh-100 overflow-y-auto flex flex-column justify-between"
           style={{ scrollBehavior: 'smooth' }}>
           <TopNav />
           {children}