diff --git a/src/components/__snapshots__/manager.test.js.snap b/src/components/__snapshots__/manager.test.js.snap
index 0b85fb135..6608b63a9 100644
--- a/src/components/__snapshots__/manager.test.js.snap
+++ b/src/components/__snapshots__/manager.test.js.snap
@@ -581,6 +581,7 @@ exports[`<Manager /> should render the overview configuration when specified. 1`
         onTouchStart={[Function]}
       >
         <Overview
+          resetViewedIndexes={[Function]}
           route={
             Object {
               "params": Array [
diff --git a/src/components/manager.js b/src/components/manager.js
index 0fcfaf628..1abbdee6a 100644
--- a/src/components/manager.js
+++ b/src/components/manager.js
@@ -157,6 +157,7 @@ export class Manager extends Component {
     this._goToSlide = this._goToSlide.bind(this);
     this._startAutoplay = this._startAutoplay.bind(this);
     this._stopAutoplay = this._stopAutoplay.bind(this);
+    this._resetViewedIndexes = this._resetViewedIndexes.bind(this);
     this.presentationConnection = null;
 
     this.state = {
@@ -409,6 +410,11 @@ export class Manager extends Component {
       this.context.history.replace(`/${slide}${this._getSuffix()}`);
     }
   }
+
+  _resetViewedIndexes() {
+    this.viewedIndexes = new Set();
+  }
+
   _prevSlide() {
     const slideIndex = this._getSlideIndex();
     this.setState({
@@ -490,7 +496,7 @@ export class Manager extends Component {
         ) {
           const slideData = '{ "slide": "0", "forward": "false" }';
           this._goToSlide({ key: 'spectacle-slide', newValue: slideData });
-          this.viewedIndexes = new Set();
+          this._resetViewedIndexes();
         }
       } else if (slideIndex < slideReference.length - 1) {
         this.viewedIndexes.add(slideIndex);
@@ -813,6 +819,7 @@ export class Manager extends Component {
           slideReference={this.state.slideReference}
           slideIndex={this._getSlideIndex()}
           route={this.props.route}
+          resetViewedIndexes={this._resetViewedIndexes}
         />
       );
     } else {
diff --git a/src/components/overview.js b/src/components/overview.js
index 7dcd705df..34aabf5ed 100644
--- a/src/components/overview.js
+++ b/src/components/overview.js
@@ -39,6 +39,7 @@ export default class Overview extends Component {
     window.removeEventListener('resize', this.resizeHandler);
   }
   _slideClicked(index) {
+    this.props.resetViewedIndexes();
     this.context.history.replace(`/${this._getHash(index)}`);
   }
   _getHash(slideIndex) {
@@ -86,6 +87,7 @@ export default class Overview extends Component {
 }
 
 Overview.propTypes = {
+  resetViewedIndexes: PropTypes.function,
   route: PropTypes.object,
   slideIndex: PropTypes.number,
   slideReference: PropTypes.array,