diff --git a/public/index.html b/public/index.html
index 04e3737..929ee0a 100644
--- a/public/index.html
+++ b/public/index.html
@@ -29,6 +29,12 @@
     <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:300,400,500,700&display=swap"/>
     <link rel="stylesheet" href="https://fonts.googleapis.com/icon?family=Material+Icons" />
     <title>Twenty Three Fifty Nine</title>
+
+    <style>
+      html {
+        scroll-behavior: smooth;
+      }
+    </style>
   </head>
   <body>
     <noscript>You need to enable JavaScript to run this app.</noscript>
diff --git a/src/course-viewer/CourseViewer.jsx b/src/course-viewer/CourseViewer.jsx
index 42d2125..6ca8d82 100644
--- a/src/course-viewer/CourseViewer.jsx
+++ b/src/course-viewer/CourseViewer.jsx
@@ -416,6 +416,9 @@ const CourseViewer = (props) => {
                                     setCurrentEdit(newAss);
                                     setChangesMade(true);
                                     setValidChanges(false);
+                                    setTimeout(() => {
+                                        window.scrollTo(0, document.body.scrollHeight);
+                                    }, 250);
                                 }}
                             > Add Assessment </Button>
                         </Stack>
