diff --git a/common/app/routes/challenges/views/classic/Classic.jsx b/common/app/routes/challenges/views/classic/Classic.jsx
index cab8cfb1f9..4a1e7da1e0 100644
--- a/common/app/routes/challenges/views/classic/Classic.jsx
+++ b/common/app/routes/challenges/views/classic/Classic.jsx
@@ -78,6 +78,7 @@ export class Challenge extends PureComponent {
   componentDidMount() {
     this.props.loadCode();
     this.props.updateSuccessMessage(randomCompliment());
+    window.scrollTo(0, 0);
   }
 
   componentWillReceiveProps(nextProps) {