diff --git a/app/actions/browser/index.js b/app/actions/browser/index.js
index 7cf6f908e60..a58f9edff33 100644
--- a/app/actions/browser/index.js
+++ b/app/actions/browser/index.js
@@ -19,6 +19,7 @@ export function addToHistory({ url, name }) {
 export function clearHistory() {
 	return {
 		type: 'CLEAR_BROWSER_HISTORY',
+		id: Date.now(),
 	};
 }
 
diff --git a/app/reducers/browser/index.js b/app/reducers/browser/index.js
index 456f9d6b77e..6dfcd84b560 100644
--- a/app/reducers/browser/index.js
+++ b/app/reducers/browser/index.js
@@ -1,3 +1,5 @@
+import AppConstants from '../../core/AppConstants';
+
 const initialState = {
 	history: [],
 	whitelist: [],
@@ -9,7 +11,7 @@ const browserReducer = (state = initialState, action) => {
 		case 'ADD_TO_BROWSER_HISTORY':
 			return {
 				...state,
-				history: [...state.history, { url: action.url, name: action.name }],
+				history: [...state.history, { url: action.url, name: action.name }].slice(0, 50),
 			};
 		case 'ADD_TO_BROWSER_WHITELIST':
 			return {
@@ -20,6 +22,8 @@ const browserReducer = (state = initialState, action) => {
 			return {
 				...state,
 				history: [],
+				tabs: [{ url: AppConstants.HOMEPAGE_URL, id: action.id }],
+				activeTab: action.id,
 			};
 		case 'CLOSE_ALL_TABS':
 			return {