diff --git a/src/pages/githubAssessments/GitHubAssessmentListing.tsx b/src/pages/githubAssessments/GitHubAssessmentListing.tsx
index baf959edd9..8c65a0737b 100644
--- a/src/pages/githubAssessments/GitHubAssessmentListing.tsx
+++ b/src/pages/githubAssessments/GitHubAssessmentListing.tsx
@@ -82,7 +82,7 @@ const GitHubAssessmentListing: React.FC<GitHubAssessmentListingProps> = props =>
   }
 
   return (
-    <div className="Assessment">
+    <div className="Assessment" style={{ overflow: 'auto' }}>
       <ContentDisplay display={display} loadContentDispatch={() => {}} />
     </div>
   );
diff --git a/src/pages/githubAssessments/GitHubClassroom.tsx b/src/pages/githubAssessments/GitHubClassroom.tsx
index c5ff9e81a9..76fc902c2a 100644
--- a/src/pages/githubAssessments/GitHubClassroom.tsx
+++ b/src/pages/githubAssessments/GitHubClassroom.tsx
@@ -91,7 +91,7 @@ const GitHubClassroom: React.FC<DispatchProps> = props => {
   );
 
   return (
-    <div className="Academy">
+    <div className="Academy" style={{ overflow: 'hidden' }}>
       <GitHubAssessmentsNavigationBar
         changeCourseHandler={changeCourseHandler}
         handleGitHubLogIn={props.handleGitHubLogIn}
diff --git a/src/pages/githubAssessments/__tests__/__snapshots__/GitHubClassroom.tsx.snap b/src/pages/githubAssessments/__tests__/__snapshots__/GitHubClassroom.tsx.snap
index b41b0a1cee..009f12b34d 100644
--- a/src/pages/githubAssessments/__tests__/__snapshots__/GitHubClassroom.tsx.snap
+++ b/src/pages/githubAssessments/__tests__/__snapshots__/GitHubClassroom.tsx.snap
@@ -1,7 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`GitHubClassroom renders correctly 1`] = `
-"<div className=\\"Academy\\">
+"<div className=\\"Academy\\" style={{...}}>
   <GitHubAssessmentsNavigationBar changeCourseHandler={[Function (anonymous)]} handleGitHubLogIn={[Function: handleGitHubLogIn]} handleGitHubLogOut={[Function: handleGitHubLogOut]} octokit={{...}} courses={[undefined]} selectedCourse=\\"\\" types={[undefined]} assessmentTypeOverviews={[undefined]} />
   <Switch>
     <Route path=\\"/githubassessments/login\\" render={[Function: render]} />
diff --git a/src/styles/_commons.scss b/src/styles/_commons.scss
index 8929af97ea..b35195cf0a 100644
--- a/src/styles/_commons.scss
+++ b/src/styles/_commons.scss
@@ -1,5 +1,5 @@
 .ContentDisplay {
-  height: 100%;
+  height: fit-content;
   width: 100%;
 
   &.row {