diff --git a/common/app/routes/Jobs/components/Jobs.jsx b/common/app/routes/Jobs/components/Jobs.jsx
index 1991567fcd..f5c678ebbe 100644
--- a/common/app/routes/Jobs/components/Jobs.jsx
+++ b/common/app/routes/Jobs/components/Jobs.jsx
@@ -48,15 +48,11 @@ export class Jobs extends PureComponent {
     showModal: PropTypes.bool
   };
 
-  createJobClickHandler(id) {
-    const { findJob, push } = this.props;
-    if (!id) {
-      return null;
-    }
+  createJobClickHandler() {
+    const { findJob } = this.props;
 
-    return id => {
+    return (id) => {
       findJob(id);
-      push(`/jobs/${id}`);
     };
   }
 
diff --git a/common/app/routes/Jobs/components/List.jsx b/common/app/routes/Jobs/components/List.jsx
index 940937436f..daebd1d999 100644
--- a/common/app/routes/Jobs/components/List.jsx
+++ b/common/app/routes/Jobs/components/List.jsx
@@ -1,5 +1,6 @@
 import React, { PropTypes } from 'react';
 import classnames from 'classnames';
+import { LinkContainer } from 'react-router-bootstrap';
 import { ListGroup, ListGroupItem } from 'react-bootstrap';
 import PureComponent from 'react-pure-render/component';
 
@@ -41,26 +42,31 @@ export default class ListJobs extends PureComponent {
         'jobs-list-highlight': isHighlighted
       });
 
+      const to = `/jobs/${id}`;
+
       return (
-        <ListGroupItem
-          className={ className }
+        <LinkContainer
           key={ id }
-          onClick={ () => handleClick(id) }>
-          <div>
-            <h4 className='pull-left' style={{ display: 'inline-block' }}>
-              <bold>{ company }</bold>
-              {' '}
-              <span className='hidden-xs hidden-sm'>
-                - { position }
-              </span>
-            </h4>
-            <h4
-              className='pull-right'
-              style={{ display: 'inline-block' }}>
-              { this.addLocation(locale) }
-            </h4>
-          </div>
-        </ListGroupItem>
+          to={ to }>
+          <ListGroupItem
+            className={ className }
+            onClick={ () => handleClick(id) }>
+            <div>
+              <h4 className='pull-left' style={{ display: 'inline-block' }}>
+                <bold>{ company }</bold>
+                {' '}
+                <span className='hidden-xs hidden-sm'>
+                  - { position }
+                </span>
+              </h4>
+              <h4
+                className='pull-right'
+                style={{ display: 'inline-block' }}>
+                { this.addLocation(locale) }
+              </h4>
+            </div>
+          </ListGroupItem>
+        </LinkContainer>
       );
     });
   }
diff --git a/common/app/routes/Jobs/components/Show.jsx b/common/app/routes/Jobs/components/Show.jsx
index 05e9320a45..410c7cfcf6 100644
--- a/common/app/routes/Jobs/components/Show.jsx
+++ b/common/app/routes/Jobs/components/Show.jsx
@@ -6,7 +6,7 @@ import PureComponent from 'react-pure-render/component';
 import { createSelector } from 'reselect';
 
 import contain from '../../../utils/professor-x';
-import { fetchJob } from '../redux/actions';
+import { fetchJobs } from '../redux/actions';
 
 import ShowJob from './ShowJob.jsx';
 import JobNotFound from './JobNotFound.jsx';
@@ -60,21 +60,22 @@ function generateMessage(
 const mapStateToProps = createSelector(
   state => state.app,
   state => state.jobsApp.currentJob,
-  ({ username, isFrontEndCert, isBackEndCert }, job = {}) => ({
+  state => state.jobsApp.jobs.entities,
+  ({ username, isFrontEndCert, isBackEndCert }, currentJob, jobs) => ({
     username,
     isFrontEndCert,
     isBackEndCert,
-    job
+    job: jobs[currentJob] || {}
   })
 );
 
 const bindableActions = {
   push,
-  fetchJob
+  fetchJobs
 };
 
 const fetchOptions = {
-  fetchAction: 'fetchJob',
+  fetchAction: 'fetchJobs',
   getActionArgs({ params: { id } }) {
     return [ id ];
   },