diff --git a/app/renderer/components/checkDefaultBrowserDialog.js b/app/renderer/components/checkDefaultBrowserDialog.js
index 41f06bf4134..ab2ee14bae7 100644
--- a/app/renderer/components/checkDefaultBrowserDialog.js
+++ b/app/renderer/components/checkDefaultBrowserDialog.js
@@ -26,11 +26,13 @@ class CheckDefaultBrowserDialog extends ImmutableComponent {
     appActions.defaultBrowserUpdated(false)
     appActions.defaultBrowserCheckComplete()
     appActions.changeSetting(settings.CHECK_DEFAULT_ON_STARTUP, this.props.checkDefaultOnStartup)
+    this.props.onHide()
   }
   onUseBrave () {
     appActions.defaultBrowserUpdated(true)
     appActions.defaultBrowserCheckComplete()
     appActions.changeSetting(settings.CHECK_DEFAULT_ON_STARTUP, this.props.checkDefaultOnStartup)
+    this.props.onHide()
   }
   render () {
     return <Dialog className='checkDefaultBrowserDialog' >
diff --git a/app/sessionStore.js b/app/sessionStore.js
index ea3da5b6265..a6b77b1df5d 100644
--- a/app/sessionStore.js
+++ b/app/sessionStore.js
@@ -234,8 +234,10 @@ module.exports.cleanAppData = (data, isShutdown) => {
   data.temporarySiteSettings = {}
   // Delete Flash state since this is checked on startup
   delete data.flashInitialized
-  // Delete defaultBrowserCheckComplete state since this is checked on startup
-  delete data.defaultBrowserCheckComplete
+  if (data.settings[settings.CHECK_DEFAULT_ON_STARTUP] === true) {
+    // Delete defaultBrowserCheckComplete state since this is checked on startup
+    delete data.defaultBrowserCheckComplete
+  }
   // Delete Recovery status on shut down
   try {
     delete data.ui.about.preferences.recoverySucceeded