diff --git a/admin/client/src/boot/index.js b/admin/client/src/boot/index.js
index 231e491f2e5..9539be18f8d 100644
--- a/admin/client/src/boot/index.js
+++ b/admin/client/src/boot/index.js
@@ -23,6 +23,7 @@ import BreadcrumbsReducer from 'state/breadcrumbs/BreadcrumbsReducer';
 import TextField from 'components/TextField/TextField';
 import HiddenField from 'components/HiddenField/HiddenField';
 import GridField from 'components/GridField/GridField';
+import { syncHistoryWithStore, routerReducer } from 'react-router-redux';
 
 // Sections
 // eslint-disable-next-line no-unused-vars
@@ -32,9 +33,12 @@ function initReactRouter(store) {
   routeRegister.updateRootRoute({
     component: App,
   });
-  const history = useRouterHistory(createHistory)({
-    basename: Config.get('adminUrlBase'),
-  });
+  let history = syncHistoryWithStore(
+    useRouterHistory(createHistory)({
+      basename: Config.get('adminUrlBase'),
+    }),
+    store
+  );
   ReactDOM.render(
     <Provider store={store}>
       <ReactRouter
@@ -97,7 +101,11 @@ function appBoot() {
   injector.register('GridField', GridField);
 
   const initialState = {};
-  const rootReducer = combineReducers(reducerRegister.getAll());
+  const reducers = reducerRegister.getAll();
+  const rootReducer = combineReducers({
+    ...reducers,
+    routing: routerReducer
+  });
   const middleware = [thunkMiddleware];
 
   if (Config.get('environment') === 'dev') {
diff --git a/gulpfile.js b/gulpfile.js
index 8ab07678c7f..cbe92a5048f 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -252,6 +252,9 @@ gulp.task('bundle-lib', function bundleLib() {
     .require('react-router',
       { expose: 'react-router' }
     )
+    .require('react-router-redux',
+      { expose: 'react-router-redux' }
+    )
     .require('page.js',
       { expose: 'page.js' }
     )
@@ -385,25 +388,28 @@ gulp.task('bundle-framework', function bundleBoot() {
       gulpUtil.log('Finished', `bundled ${bundleFileName} ${msg}`);
     })
     .transform('babelify', babelifyOptions)
-    .external('components/Toolbar/Toolbar')
-    .external('components/FormBuilder/FormBuilder')
+    .external('bootstrap-collapse')
+    .external('components/Breadcrumb/Breadcrumb')
     .external('components/FormAction/FormAction')
-    .external('deep-freeze-strict')
+    .external('components/FormBuilder/FormBuilder')
     .external('components/GridField/GridField')
+    .external('components/Toolbar/Toolbar')
+    .external('deep-freeze-strict')
     .external('i18n')
     .external('jQuery')
+    .external('lib/Backend')
+    .external('lib/ReducerRegister')
+    .external('lib/RouteRegister')
+    .external('lib/SilverStripeComponent')
     .external('page.js')
     .external('react-addons-test-utils')
     .external('react-dom')
     .external('react-redux')
+    .external('react-router-redux')
+    .external('react-router')
     .external('react')
-    .external('lib/ReducerRegister')
-    .external('lib/RouteRegister')
     .external('redux-thunk')
     .external('redux')
-    .external('lib/Backend')
-    .external('lib/SilverStripeComponent')
-    .external('bootstrap-collapse')
     .bundle()
     .on('update', bundleBoot)
     .on('error', notify.onError({ message: `${bundleFileName}: <%= error.message %>` }))
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index ab7978e37bf..d295f38bfcd 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -13429,6 +13429,10 @@
         }
       }
     },
+    "react-router-redux": {
+      "version": "4.0.5",
+      "resolved": "https://registry.npmjs.org/react-router-redux/-/react-router-redux-4.0.5.tgz"
+    },
     "redux": {
       "version": "3.0.5",
       "resolved": "https://registry.npmjs.org/redux/-/redux-3.0.5.tgz"
diff --git a/package.json b/package.json
index 0ce40a644e2..61c7c0930a1 100644
--- a/package.json
+++ b/package.json
@@ -55,6 +55,7 @@
     "react-dom": "^0.14.8",
     "react-redux": "^4.4.1",
     "react-router": "^2.4.1",
+    "react-router-redux": "^4.0.5",
     "redux": "https://registry.npmjs.org/redux/-/redux-3.0.5.tgz",
     "redux-thunk": "^2.1.0",
     "tinymce": "^4.3.3",