diff --git a/app/browser/menu.js b/app/browser/menu.js
index 17469c71e22..e4ef286b454 100644
--- a/app/browser/menu.js
+++ b/app/browser/menu.js
@@ -693,11 +693,11 @@ const doAction = (action) => {
       }
       break
     case appConstants.APP_ON_CLEAR_BROWSING_DATA:
-      if (action.clearDataDetail.get('browserHistory')) {
-        appDispatcher.waitFor([appStore.dispatchToken], () => {
+      appDispatcher.waitFor([appStore.dispatchToken], () => {
+        if (appStore.getState().getIn(['clearBrowsingDataDefaults', 'browserHistory'])) {
           createMenu()
-        })
-      }
+        }
+      })
       break
     case windowConstants.WINDOW_CLICK_MENUBAR_SUBMENU:
       appDispatcher.waitFor([appStore.dispatchToken], () => {
diff --git a/app/browser/reducers/sitesReducer.js b/app/browser/reducers/sitesReducer.js
index a2ea7d0ecff..e006312a052 100644
--- a/app/browser/reducers/sitesReducer.js
+++ b/app/browser/reducers/sitesReducer.js
@@ -42,7 +42,7 @@ const sitesReducer = (state, action, immutableAction) => {
       state = siteCache.loadLocationSiteKeysCache(state)
       break
     case appConstants.APP_ON_CLEAR_BROWSING_DATA:
-      if (immutableAction.getIn(['clearDataDetail', 'browserHistory'])) {
+      if (state.getIn(['clearBrowsingDataDefaults', 'browserHistory'])) {
         state = state.set('sites', siteUtil.clearHistory(state.get('sites')))
         filtering.clearHistory()
       }
diff --git a/app/ledger.js b/app/ledger.js
index 1217cd24e2f..941400a56bd 100644
--- a/app/ledger.js
+++ b/app/ledger.js
@@ -56,7 +56,6 @@ const uuid = require('uuid')
 const appActions = require('../js/actions/appActions')
 const appConfig = require('../js/constants/appConfig')
 const appConstants = require('../js/constants/appConstants')
-const appDispatcher = require('../js/dispatcher/appDispatcher')
 const messages = require('../js/constants/messages')
 const settings = require('../js/constants/settings')
 const request = require('../js/lib/request')
@@ -145,7 +144,7 @@ let notificationTryPaymentsMessage
 let notificationTimeout = null
 
 // TODO(bridiver) - create a better way to get setting changes
-const doAction = (action) => {
+const doAction = (state, action) => {
   var i, publisher
 
 /* TBD: handle
@@ -163,12 +162,26 @@ const doAction = (action) => {
   }
 
   switch (action.actionType) {
+    case appConstants.APP_SET_STATE:
+      init()
+      break
+
+    case appConstants.APP_BACKUP_KEYS:
+      state = backupKeys(state, action)
+      break
+
+    case appConstants.APP_RECOVER_WALLET:
+      state = recoverKeys(state, action)
+      break
+
     case appConstants.APP_SHUTTING_DOWN:
       quit()
       break
 
     case appConstants.APP_ON_CLEAR_BROWSING_DATA:
-      if (action.clearDataDetail.get('browserHistory') && !getSetting(settings.PAYMENTS_ENABLED)) reset(true)
+      if (state.getIn(['clearBrowsingDataDefaults', 'browserHistory']) && !getSetting(settings.PAYMENTS_ENABLED)) {
+        reset(true)
+      }
       break
 
     case appConstants.APP_IDLE_STATE_CHANGED:
@@ -264,6 +277,8 @@ const doAction = (action) => {
     default:
       break
   }
+
+  return state
 }
 
 /*
@@ -272,7 +287,6 @@ const doAction = (action) => {
 
 var init = () => {
   try {
-    appDispatcher.register(doAction)
     initialize(getSetting(settings.PAYMENTS_ENABLED))
   } catch (ex) { console.log('ledger.js initialization failed: ' + ex.toString() + '\n' + ex.stack) }
 }
@@ -2250,5 +2264,6 @@ module.exports = {
   backupKeys: backupKeys,
   quit: quit,
   boot: boot,
-  reset: reset
+  reset: reset,
+  doAction
 }
diff --git a/app/renderer/components/main/clearBrowsingDataPanel.js b/app/renderer/components/main/clearBrowsingDataPanel.js
index 6e44f73733f..de0fa9186ea 100644
--- a/app/renderer/components/main/clearBrowsingDataPanel.js
+++ b/app/renderer/components/main/clearBrowsingDataPanel.js
@@ -7,6 +7,7 @@ const Immutable = require('immutable')
 const ipc = require('electron').ipcRenderer
 
 // Components
+const ReduxComponent = require('../reduxComponent')
 const Dialog = require('../common/dialog')
 const Button = require('../common/button')
 const SwitchControl = require('../common/switchControl')
@@ -20,6 +21,7 @@ const {
 
 // Actions
 const appActions = require('../../../../js/actions/appActions')
+const windowActions = require('../../../../js/actions/windowActions')
 
 // Constants
 const messages = require('../../../../js/constants/messages')
@@ -36,71 +38,100 @@ class ClearBrowsingDataPanel extends React.Component {
     this.onToggleAutofillData = this.onToggleSetting.bind(this, 'autofillData')
     this.onToggleSavedSiteSettings = this.onToggleSetting.bind(this, 'savedSiteSettings')
     this.onClear = this.onClear.bind(this)
-    this.state = {
-      clearBrowsingDataDetail: props.clearBrowsingDataDefaults ? props.clearBrowsingDataDefaults : Immutable.Map()
-    }
+    this.onCancel = this.onCancel.bind(this)
   }
-  onToggleSetting (setting) {
-    this.setState(({clearBrowsingDataDetail}) => ({
-      clearBrowsingDataDetail: clearBrowsingDataDetail.update(setting, isChecked => !isChecked)
-    }))
+
+  onToggleSetting (setting, e) {
+    appActions.onToggleBrowsingData(setting, e.target.value)
   }
+
   onClear () {
-    appActions.onClearBrowsingData(this.state.clearBrowsingDataDetail)
-    this.props.onHide()
-    let detail = this.state.clearBrowsingDataDetail
-    if (detail.get('allSiteCookies') && detail.get('browserHistory') &&
-        detail.get('cachedImagesAndFiles')) {
+    appActions.onClearBrowsingData()
+    this.onHide()
+
+    if (
+      this.props.allSiteCookies &&
+      this.props.browserHistory &&
+      this.props.cachedImagesAndFiles
+    ) {
       ipc.send(messages.PREFS_RESTART)
     }
   }
+
+  onCancel () {
+    appActions.onCancelBrowsingData()
+    this.onHide()
+  }
+
+  onHide () {
+    windowActions.setClearBrowsingDataPanelVisible(false)
+  }
+
+  mergeProps (state, ownProps) {
+    const tempData = state.get('tempClearBrowsingData', Immutable.Map())
+    const data = state.get('clearBrowsingDataDefaults', Immutable.Map()).merge(tempData)
+
+    const props = {}
+    props.allSiteCookies = data.get('allSiteCookies')
+    props.browserHistory = data.get('browserHistory')
+    props.downloadHistory = data.get('downloadHistory')
+    props.cachedImagesAndFiles = data.get('cachedImagesAndFiles')
+    props.savedPasswords = data.get('savedPasswords')
+    props.allSiteCookies = data.get('allSiteCookies')
+    props.autocompleteData = data.get('autocompleteData')
+    props.autofillData = data.get('autofillData')
+    props.savedSiteSettings = data.get('savedSiteSettings')
+
+    return props
+  }
+
   render () {
-    return <Dialog onHide={this.props.onHide} testId='clearBrowsingDataPanel' isClickDismiss>
+    return <Dialog onHide={this.onHide} testId='clearBrowsingDataPanel' isClickDismiss>
       <CommonFormSmall onClick={(e) => e.stopPropagation()}>
         <CommonFormTitle data-l10n-id='clearBrowsingData' />
         <CommonFormSection>
           <SwitchControl
             rightl10nId='browserHistory'
             testId='browserHistorySwitch'
-            checkedOn={this.state.clearBrowsingDataDetail.get('browserHistory')}
+            checkedOn={this.props.browserHistory}
             onClick={this.onToggleBrowserHistory} />
           <SwitchControl
             rightl10nId='downloadHistory'
-            checkedOn={this.state.clearBrowsingDataDetail.get('downloadHistory')}
+            checkedOn={this.props.downloadHistory}
             onClick={this.onToggleDownloadHistory} />
           <SwitchControl
             rightl10nId='cachedImagesAndFiles'
-            checkedOn={this.state.clearBrowsingDataDetail.get('cachedImagesAndFiles')}
+            checkedOn={this.props.cachedImagesAndFiles}
             onClick={this.onToggleCachedImagesAndFiles} />
           <SwitchControl
             rightl10nId='savedPasswords'
-            checkedOn={this.state.clearBrowsingDataDetail.get('savedPasswords')}
+            checkedOn={this.props.savedPasswords}
             onClick={this.onToggleSavedPasswords} />
           <SwitchControl
             rightl10nId='allSiteCookies'
-            checkedOn={this.state.clearBrowsingDataDetail.get('allSiteCookies')}
+            checkedOn={this.props.allSiteCookies}
             onClick={this.onToggleAllSiteCookies} />
           <SwitchControl
             rightl10nId='autocompleteData'
             testId='autocompleteDataSwitch'
-            checkedOn={this.state.clearBrowsingDataDetail.get('autocompleteData')}
+            checkedOn={this.props.autocompleteData}
             onClick={this.onToggleAutocompleteData} />
           <SwitchControl
             rightl10nId='autofillData'
             testId='autofillDataSwitch'
-            checkedOn={this.state.clearBrowsingDataDetail.get('autofillData')}
+            checkedOn={this.props.autofillData}
             onClick={this.onToggleAutofillData} />
           <SwitchControl
             rightl10nId='savedSiteSettings'
             testId='siteSettingsSwitch'
-            checkedOn={this.state.clearBrowsingDataDetail.get('savedSiteSettings')}
+            checkedOn={this.props.savedSiteSettings}
             onClick={this.onToggleSavedSiteSettings} />
         </CommonFormSection>
         <CommonFormButtonWrapper>
           <Button className='whiteButton'
             l10nId='cancel'
             testId='cancelButton'
-            onClick={this.props.onHide}
+            onClick={this.onCancel}
           />
           <Button className='primaryButton'
             l10nId='clear'
@@ -116,4 +147,4 @@ class ClearBrowsingDataPanel extends React.Component {
   }
 }
 
-module.exports = ClearBrowsingDataPanel
+module.exports = ReduxComponent.connect(ClearBrowsingDataPanel)
diff --git a/app/renderer/components/main/main.js b/app/renderer/components/main/main.js
index 30e709543f0..c797e01a1a9 100644
--- a/app/renderer/components/main/main.js
+++ b/app/renderer/components/main/main.js
@@ -77,7 +77,6 @@ class Main extends ImmutableComponent {
     this.onClickWindow = this.onClickWindow.bind(this)
     this.onHideSiteInfo = this.onHideSiteInfo.bind(this)
     this.onHideBraveryPanel = this.onHideBraveryPanel.bind(this)
-    this.onHideClearBrowsingDataPanel = this.onHideClearBrowsingDataPanel.bind(this)
     this.onHideAutofillCreditCardPanel = this.onHideAutofillCreditCardPanel.bind(this)
     this.onTabContextMenu = this.onTabContextMenu.bind(this)
     this.checkForTitleMode = debounce(this.checkForTitleMode.bind(this), 20)
@@ -530,10 +529,6 @@ class Main extends ImmutableComponent {
     windowActions.setBraveryPanelDetail()
   }
 
-  onHideClearBrowsingDataPanel () {
-    windowActions.setClearBrowsingDataPanelVisible(false)
-  }
-
   onHideAutofillCreditCardPanel () {
     windowActions.setAutofillCreditCardDetail()
   }
@@ -684,9 +679,7 @@ class Main extends ImmutableComponent {
         }
         {
          clearBrowsingDataPanelIsVisible
-          ? <ClearBrowsingDataPanel
-            clearBrowsingDataDefaults={this.props.appState.get('clearBrowsingDataDefaults')}
-            onHide={this.onHideClearBrowsingDataPanel} />
+          ? <ClearBrowsingDataPanel />
           : null
         }
         {
diff --git a/docs/appActions.md b/docs/appActions.md
index de02895e6f3..06d97d1db3c 100644
--- a/docs/appActions.md
+++ b/docs/appActions.md
@@ -477,14 +477,10 @@ Adds information about pending basic auth login requests
 
 
 
-### onClearBrowsingData(clearDataDetail) 
+### onClearBrowsingData() 
 
 Clears the data specified in clearDataDetail
 
-**Parameters**
-
-**clearDataDetail**: `object`, the app data to clear as per doc/state.md's clearBrowsingDataDefaults
-
 
 
 ### importBrowserData(selected) 
@@ -1124,6 +1120,18 @@ Dispatches a message to indicate that the update log is being opened
 
 
 
+### onToggleBrowsingData() 
+
+Save temp setting for clear browsing data
+
+
+
+### onCancelBrowsingData() 
+
+Clear temp setting for clear browsing data
+
+
+
 
 * * *
 
diff --git a/js/actions/appActions.js b/js/actions/appActions.js
index 3592f3de804..679bc2a3611 100644
--- a/js/actions/appActions.js
+++ b/js/actions/appActions.js
@@ -587,12 +587,10 @@ const appActions = {
 
   /**
    * Clears the data specified in clearDataDetail
-   * @param {object} clearDataDetail - the app data to clear as per doc/state.md's clearBrowsingDataDefaults
    */
-  onClearBrowsingData: function (clearDataDetail) {
+  onClearBrowsingData: function () {
     dispatch({
-      actionType: appConstants.APP_ON_CLEAR_BROWSING_DATA,
-      clearDataDetail
+      actionType: appConstants.APP_ON_CLEAR_BROWSING_DATA
     })
   },
 
@@ -1426,6 +1424,26 @@ const appActions = {
     dispatch({
       actionType: appConstants.APP_UPDATE_LOG_OPENED
     })
+  },
+
+  /**
+   * Save temp setting for clear browsing data
+   */
+  onToggleBrowsingData: function (property, newValue) {
+    dispatch({
+      actionType: appConstants.APP_ON_TOGGLE_BROWSING_DATA,
+      property,
+      newValue
+    })
+  },
+
+  /**
+   * Clear temp setting for clear browsing data
+   */
+  onCancelBrowsingData: function () {
+    dispatch({
+      actionType: appConstants.APP_ON_CANCEL_BROWSING_DATA
+    })
   }
 }
 
diff --git a/js/constants/appConstants.js b/js/constants/appConstants.js
index ec1efbfb048..03d69035d51 100644
--- a/js/constants/appConstants.js
+++ b/js/constants/appConstants.js
@@ -132,7 +132,9 @@ const appConstants = {
   APP_REMOVE_PASSWORD_SITE: _, /** @param {Object} passwordDetail */
   APP_CLEAR_PASSWORDS: _,
   APP_UPDATE_LOG_OPENED: _,
-  APP_URL_BAR_SELECTED_INDEX_CHANGED: _
+  APP_URL_BAR_SELECTED_INDEX_CHANGED: _,
+  APP_ON_TOGGLE_BROWSING_DATA: _,
+  APP_ON_CANCEL_BROWSING_DATA: _
 }
 
 module.exports = mapValuesByKeys(appConstants)
diff --git a/js/stores/appStore.js b/js/stores/appStore.js
index dd8ea6d331c..6685150621a 100644
--- a/js/stores/appStore.js
+++ b/js/stores/appStore.js
@@ -373,7 +373,6 @@ function handleChangeSettingAction (settingKey, settingValue) {
 }
 
 let reducers = []
-let ledger = null
 
 const applyReducers = (state, action, immutableAction) => reducers.reduce(
     (appState, reducer) => {
@@ -385,7 +384,6 @@ const applyReducers = (state, action, immutableAction) => reducers.reduce(
 
 const handleAppAction = (action) => {
   if (action.actionType === appConstants.APP_SET_STATE) {
-    ledger = require('../../app/ledger')
     reducers = [
       require('../../app/browser/reducers/downloadsReducer'),
       require('../../app/browser/reducers/flashReducer'),
@@ -404,7 +402,8 @@ const handleAppAction = (action) => {
       require('../../app/browser/reducers/dragDropReducer'),
       require('../../app/browser/reducers/extensionsReducer'),
       require('../../app/browser/reducers/shareReducer'),
-      require('../../app/browser/reducers/updatesReducer')
+      require('../../app/browser/reducers/updatesReducer'),
+      require('../../app/ledger').doAction
     ]
     initialized = true
     appState = action.appState
@@ -430,7 +429,6 @@ const handleAppAction = (action) => {
       appState = profiles.init(appState, action, appStore)
       appState = require('../../app/browser/menu').init(appState, action, appStore)
       appState = require('../../app/sync').init(appState, action, appStore)
-      ledger.init()
       break
     case appConstants.APP_SHUTTING_DOWN:
       AppDispatcher.shutdown()
@@ -651,12 +649,6 @@ const handleAppAction = (action) => {
     case appConstants.APP_SET_DICTIONARY:
       appState = appState.setIn(['dictionary', 'locale'], action.locale)
       break
-    case appConstants.APP_BACKUP_KEYS:
-      appState = ledger.backupKeys(appState, action)
-      break
-    case appConstants.APP_RECOVER_WALLET:
-      appState = ledger.recoverKeys(appState, action)
-      break
     case appConstants.APP_LEDGER_RECOVERY_STATUS_CHANGED:
       {
         const date = new Date().getTime()
@@ -665,38 +657,48 @@ const handleAppAction = (action) => {
       }
       break
     case appConstants.APP_ON_CLEAR_BROWSING_DATA:
-      // TODO: Maybe make storing this state optional?
-      appState = appState.set('clearBrowsingDataDefaults', action.clearDataDetail)
-      if (action.clearDataDetail.get('browserHistory')) {
-        appState = aboutNewTabState.setSites(appState, action)
-        appState = aboutHistoryState.setHistory(appState, action)
+      const defaults = appState.get('clearBrowsingDataDefaults')
+      const temp = appState.get('tempClearBrowsingData')
+      const clearData = defaults ? defaults.merge(temp) : temp
+
+      if (clearData.get('browserHistory')) {
+        appState = aboutNewTabState.setSites(appState)
+        appState = aboutHistoryState.setHistory(appState)
         syncActions.clearHistory()
         BrowserWindow.getAllWindows().forEach((wnd) => wnd.webContents.send(messages.CLEAR_CLOSED_FRAMES))
       }
-      if (action.clearDataDetail.get('downloadHistory')) {
+      if (clearData.get('downloadHistory')) {
         handleAppAction({actionType: appConstants.APP_CLEAR_COMPLETED_DOWNLOADS})
       }
-      // Site cookies clearing should also clear cache so that evercookies will be properly removed
-      if (action.clearDataDetail.get('cachedImagesAndFiles') || action.clearDataDetail.get('allSiteCookies')) {
+      // Site cookies clearing should also clear cache so that every cookies will be properly removed
+      if (clearData.get('cachedImagesAndFiles') || clearData.get('allSiteCookies')) {
         filtering.clearCache()
       }
-      if (action.clearDataDetail.get('savedPasswords')) {
+      if (clearData.get('savedPasswords')) {
         handleAppAction({actionType: appConstants.APP_CLEAR_PASSWORDS})
       }
-      if (action.clearDataDetail.get('allSiteCookies')) {
+      if (clearData.get('allSiteCookies')) {
         filtering.clearStorageData()
       }
-      if (action.clearDataDetail.get('autocompleteData')) {
+      if (clearData.get('autocompleteData')) {
         autofill.clearAutocompleteData()
       }
-      if (action.clearDataDetail.get('autofillData')) {
+      if (clearData.get('autofillData')) {
         autofill.clearAutofillData()
       }
-      if (action.clearDataDetail.get('savedSiteSettings')) {
+      if (clearData.get('savedSiteSettings')) {
         appState = appState.set('siteSettings', Immutable.Map())
         appState = appState.set('temporarySiteSettings', Immutable.Map())
         syncActions.clearSiteSettings()
       }
+      appState = appState.set('tempClearBrowsingData', Immutable.Map())
+      appState = appState.set('clearBrowsingDataDefaults', clearData)
+      break
+    case appConstants.APP_ON_TOGGLE_BROWSING_DATA:
+      appState = appState.setIn(['tempClearBrowsingData', action.property], action.newValue)
+      break
+    case appConstants.APP_ON_CANCEL_BROWSING_DATA:
+      appState = appState.set('tempClearBrowsingData', Immutable.Map())
       break
     case appConstants.APP_IMPORT_BROWSER_DATA:
       {
diff --git a/test/unit/app/browser/reducers/sitesReducerTest.js b/test/unit/app/browser/reducers/sitesReducerTest.js
index 117ffa2f48c..2770d8138fe 100644
--- a/test/unit/app/browser/reducers/sitesReducerTest.js
+++ b/test/unit/app/browser/reducers/sitesReducerTest.js
@@ -43,8 +43,9 @@ describe('sitesReducerTest', function () {
         actionType: appConstants.APP_ON_CLEAR_BROWSING_DATA,
         clearDataDetail: {browserHistory: true}
       }
+      const newState = initState.setIn(['tempClearBrowsingData', 'browserHistory'], true)
       this.clearHistory = sinon.stub(this.fakeFiltering, 'clearHistory')
-      this.state = sitesReducer(initState, this.action, makeImmutable(this.action))
+      this.state = sitesReducer(newState, this.action, makeImmutable(this.action))
     })
 
     after(function () {