diff --git a/public/app/containers/ServerStats/ServerStats.tsx b/public/app/containers/ServerStats/ServerStats.tsx
index 761b296855f..bed86b43160 100644
--- a/public/app/containers/ServerStats/ServerStats.tsx
+++ b/public/app/containers/ServerStats/ServerStats.tsx
@@ -3,6 +3,8 @@ import { hot } from 'react-hot-loader';
 import { inject, observer } from 'mobx-react';
 import PageHeader from 'app/core/components/PageHeader/PageHeader';
 import IContainerProps from 'app/containers/IContainerProps';
+import { store } from 'app/store/configureStore';
+import { setNav } from 'app/store/nav/actions';
 
 @inject('nav', 'serverStats')
 @observer
@@ -13,6 +15,8 @@ export class ServerStats extends React.Component<IContainerProps, any> {
 
     nav.load('cfg', 'admin', 'server-stats');
     serverStats.load();
+
+    store.dispatch(setNav('new', { asd: 'tasd' }));
   }
 
   render() {
diff --git a/public/app/core/components/grafana_app.ts b/public/app/core/components/grafana_app.ts
index fd2e32db3a7..fa2c96ade32 100644
--- a/public/app/core/components/grafana_app.ts
+++ b/public/app/core/components/grafana_app.ts
@@ -10,6 +10,7 @@ import { createStore } from 'app/stores/store';
 import colors from 'app/core/utils/colors';
 import { BackendSrv } from 'app/core/services/backend_srv';
 import { DatasourceSrv } from 'app/features/plugins/datasource_srv';
+import { configureStore } from 'app/store/configureStore';
 
 export class GrafanaCtrl {
   /** @ngInject */
@@ -24,6 +25,7 @@ export class GrafanaCtrl {
     backendSrv: BackendSrv,
     datasourceSrv: DatasourceSrv
   ) {
+    configureStore();
     createStore({ backendSrv, datasourceSrv });
 
     $scope.init = function() {
diff --git a/public/app/store/configureStore.dev.ts b/public/app/store/configureStore.dev.ts
deleted file mode 100644
index 98b1ca19634..00000000000
--- a/public/app/store/configureStore.dev.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { createStore, applyMiddleware, compose } from 'redux';
-import thunk from 'redux-thunk';
-import { createLogger } from 'redux-logger';
-import rootReducer from './reducers';
-
-export let store;
-
-export function configureStore() {
-  const composeEnhancers = (window as any).__REDUX_DEVTOOLS_EXTENSION_COMPOSE__ || compose;
-  store = createStore(rootReducer, {}, composeEnhancers(applyMiddleware(thunk, createLogger())));
-}
diff --git a/public/app/store/configureStore.prod.ts b/public/app/store/configureStore.prod.ts
deleted file mode 100644
index 3c75e5b850b..00000000000
--- a/public/app/store/configureStore.prod.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { createStore, applyMiddleware, compose } from 'redux';
-import thunk from 'redux-thunk';
-import rootReducer from './reducers';
-
-export let store;
-
-export function configureStore() {
-  store = createStore(rootReducer, {}, compose(applyMiddleware(thunk)));
-}
diff --git a/public/app/store/configureStore.ts b/public/app/store/configureStore.ts
index 78c9ea1fdc0..a0dfe576ed6 100644
--- a/public/app/store/configureStore.ts
+++ b/public/app/store/configureStore.ts
@@ -1,5 +1,15 @@
-if (process.env.NODE_ENV === 'production') {
-  module.exports = require('./configureStore.prod');
-} else {
-  module.exports = require('./configureStore.dev');
+import { createStore, applyMiddleware, compose, combineReducers } from 'redux';
+import thunk from 'redux-thunk';
+import { createLogger } from 'redux-logger';
+import { navReducer } from './nav/reducers';
+
+const rootReducer = combineReducers({
+  nav: navReducer,
+});
+
+export let store;
+
+export function configureStore() {
+  const composeEnhancers = (window as any).__REDUX_DEVTOOLS_EXTENSION_COMPOSE__ || compose;
+  store = createStore(rootReducer, {}, composeEnhancers(applyMiddleware(thunk, createLogger())));
 }
diff --git a/public/app/store/nav/actions.ts b/public/app/store/nav/actions.ts
new file mode 100644
index 00000000000..eca99cc2b90
--- /dev/null
+++ b/public/app/store/nav/actions.ts
@@ -0,0 +1,30 @@
+//
+// Only test actions to test redux & typescript
+//
+
+export enum ActionTypes {
+  SET_NAV = 'SET_NAV',
+  SET_QUERY = 'SET_QUERY',
+}
+
+export interface SetNavAction {
+  type: ActionTypes.SET_NAV;
+  payload: {
+    path: string;
+    query: object;
+  };
+}
+
+export interface SetQueryAction {
+  type: ActionTypes.SET_QUERY;
+  payload: {
+    query: object;
+  };
+}
+
+export type Action = SetNavAction | SetQueryAction;
+
+export const setNav = (path: string, query: object): SetNavAction => ({
+  type: ActionTypes.SET_NAV,
+  payload: { path: path, query: query },
+});
diff --git a/public/app/store/nav/nav.ts b/public/app/store/nav/nav.ts
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/public/app/store/nav/reducers.ts b/public/app/store/nav/reducers.ts
new file mode 100644
index 00000000000..6e9d6e713a0
--- /dev/null
+++ b/public/app/store/nav/reducers.ts
@@ -0,0 +1,30 @@
+import { Action, ActionTypes } from './actions';
+
+export interface NavState {
+  path: string;
+  query: object;
+}
+
+const initialState: NavState = {
+  path: '/test',
+  query: {},
+};
+
+export const navReducer = (state: NavState = initialState, action: Action): NavState => {
+  switch (action.type) {
+    case ActionTypes.SET_NAV: {
+      return { ...state, path: action.payload.path, query: action.payload.query };
+    }
+
+    case ActionTypes.SET_QUERY: {
+      return {
+        ...state,
+        query: action.payload.query,
+      };
+    }
+
+    default: {
+      return state;
+    }
+  }
+};
diff --git a/public/app/store/rootReducer.ts b/public/app/store/rootReducer.ts
deleted file mode 100644
index 2e6d4cb53cd..00000000000
--- a/public/app/store/rootReducer.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import * as ActionTypes from '../actions';
-import { combineReducers } from 'redux';
-import { nav } from './nav';
-
-// Updates error message to notify about the failed fetches.
-const errorMessage = (state = null, action) => {
-  const { type, error } = action;
-
-  if (type === ActionTypes.RESET_ERROR_MESSAGE) {
-    return null;
-  } else if (error) {
-    return error;
-  }
-
-  return state;
-};
-
-const rootReducer = combineReducers({
-  nav,
-  errorMessage,
-});
-
-export default rootReducer;