diff --git a/src/components/Dashboard.jsx b/src/components/Dashboard.jsx
index 286be0d..a462491 100644
--- a/src/components/Dashboard.jsx
+++ b/src/components/Dashboard.jsx
@@ -22,7 +22,7 @@ class Dashboard extends React.Component {
 
     this.handleHighlight = this.handleHighlight.bind(this);
     this.handleSelect = this.handleSelect.bind(this);
-    // this.handleToggle = this.handleToggle.bind(this);
+    this.handleSelectNarrative = this.handleSelectNarrative.bind(this);
     this.handleTagFilter = this.handleTagFilter.bind(this);
     this.updateTimerange = this.updateTimerange.bind(this);
 
@@ -55,6 +55,10 @@ class Dashboard extends React.Component {
     }
   }
 
+  handleSelectNarrative(narrative) {
+    this.props.actions.updateNarrative(narrative);
+  }
+
   handleTagFilter(tag) {
     this.props.actions.updateTagFilters(tag);
   }
@@ -78,12 +82,13 @@ class Dashboard extends React.Component {
       <div>
         <Toolbar
           onFilter={this.handleTagFilter}
-          onSelectNarrative={(narrative) => { this.props.actions.updateNarrative(narrative); }}
+          onSelectNarrative={this.handleSelectNarrative}
           actions={this.props.actions}
         />
         <Viewport
           methods={{
             onSelect: this.handleSelect,
+            onSelectNarrative: this.handleSelectNarrative,
             getCategoryColor: category => this.getCategoryColor(category)
           }}
         />
@@ -97,7 +102,7 @@ class Dashboard extends React.Component {
         {(this.props.app.narrative !== null)
             ? <NarrativeCard
               onSelect={this.handleSelect}
-              onSelectNarrative={(narrative) => { this.props.actions.updateNarrative(narrative); }}
+              onSelectNarrative={this.handleSelectNarrative}
             />
             : ''
         }
diff --git a/src/js/map/map.js b/src/js/map/map.js
index b702f2e..05739ce 100644
--- a/src/js/map/map.js
+++ b/src/js/map/map.js
@@ -377,7 +377,7 @@ Stop and start the development process in terminal after you have added your tok
 
   function renderNarratives() {
     const narrativesDom = svg.selectAll('.narrative')
-      .data(domain.narratives)
+      .data((app.narrative !== null) ? domain.narratives : [])
 
     narrativesDom
       .exit()
@@ -434,6 +434,7 @@ Stop and start the development process in terminal after you have added your tok
           .attr('marker-start', (d, j) => !j ? getMarker(n) :  'none')
           .attr('marker-end', getMarker(n))
           .attr('mid-marker', getMarker(n))
+          .on('click', () => methods.onSelectNarrative(n) )
 
       steps
           .attr('x1', d => getCoords(d).x + getSVGBoundaries().transformX)