diff --git a/ui/js/actions/app.js b/ui/js/actions/app.js
index 0f086392c..a96a9d96c 100644
--- a/ui/js/actions/app.js
+++ b/ui/js/actions/app.js
@@ -33,7 +33,10 @@ export function doNavigate(path, params = {}, options = {}) {
 
     const state = getState();
     const pageTitle = selectPageTitle(state);
-    dispatch(doHistoryPush({ params, is_last_page: true }, pageTitle, url));
+    const historyState = history.state;
+    dispatch(
+      doHistoryPush({ params, page: historyState.page + 1 }, pageTitle, url)
+    );
   };
 }
 
@@ -88,10 +91,10 @@ export function doHistoryBack() {
 
 export function doHistoryForward() {
   return function(dispatch, getState) {
-    if (!selectIsForwardDisabled(getState())) {
-      history.forward();
-      dispatch({ type: types.HISTORY_NAVIGATE });
-    }
+    // if (!selectIsForwardDisabled(getState())) {
+    history.forward();
+    dispatch({ type: types.HISTORY_NAVIGATE });
+    // }
   };
 }
 
@@ -279,7 +282,7 @@ export function doDaemonReady() {
     const path = window.location.hash || "#/discover";
     const params = parseQueryParams(path.split("?")[1] || "");
     history.replaceState(
-      { params, is_first_page: true },
+      { params, is_first_page: true, page: 1 },
       document.title,
       `${path}`
     );
diff --git a/ui/js/component/header/view.jsx b/ui/js/component/header/view.jsx
index 8fdbc4a65..81b70d703 100644
--- a/ui/js/component/header/view.jsx
+++ b/ui/js/component/header/view.jsx
@@ -12,7 +12,6 @@ export const Header = props => {
     navigate,
     publish,
   } = props;
-  console.log(props);
   return (
     <header id="header">
       <div className="header__item">
diff --git a/ui/js/reducers/app.js b/ui/js/reducers/app.js
index ef5a866cc..bca90028c 100644
--- a/ui/js/reducers/app.js
+++ b/ui/js/reducers/app.js
@@ -48,7 +48,6 @@ reducers[types.DAEMON_VERSION_MISMATCH] = function(state, action) {
 reducers[types.CHANGE_PATH] = function(state, action) {
   return Object.assign({}, state, {
     currentPath: action.data.path,
-    isForwardDisabled: !action.data.isBack,
   });
 };
 
@@ -166,9 +165,12 @@ reducers[types.WINDOW_FOCUSED] = function(state, action) {
 };
 
 reducers[types.HISTORY_NAVIGATE] = (state, action) => {
+  console.log(history.state);
+  console.log(history.length);
+  console.log(history.state.page === history.length);
   return Object.assign({}, state, {
-    isBackDisabled: !history.state || history.state.is_first_page === true,
-    isForwardDisabled: !history.state,
+    isBackDisabled: history.state.page === 1,
+    isForwardDisabled: history.state.page > history.length,
   });
 };