diff --git a/common/app/routes/challenges/components/classic/Side-Panel.jsx b/common/app/routes/challenges/components/classic/Side-Panel.jsx
index ef1c6c3f3a..a81497437b 100644
--- a/common/app/routes/challenges/components/classic/Side-Panel.jsx
+++ b/common/app/routes/challenges/components/classic/Side-Panel.jsx
@@ -1,4 +1,5 @@
 import React, { PropTypes } from 'react';
+import ReactDom from 'react-dom';
 import { createSelector } from 'reselect';
 import { connect } from 'react-redux';
 
@@ -75,6 +76,12 @@ export class SidePanel extends PureComponent {
     });
   }
 
+  componentWillReceiveProps(nextProps) {
+    if (this.props.title !== nextProps.title) {
+      ReactDom.findDOMNode(this).scrollTop = 0;
+    }
+  }
+
   render() {
     const {
       title,