diff --git a/src/renderer/App.js b/src/renderer/App.js
index 25314fb4a..0563ba900 100644
--- a/src/renderer/App.js
+++ b/src/renderer/App.js
@@ -70,6 +70,15 @@ export default Vue.extend({
     },
     searchSettings: function () {
       return this.$store.getters.getSearchSettings
+    },
+    profileList: function () {
+      return this.$store.getters.getProfileList
+    },
+    activeProfile: function () {
+      return this.$store.getters.getActiveProfile
+    },
+    defaultProfile: function () {
+      return this.$store.getters.getDefaultProfile
     }
   },
   mounted: function () {
@@ -256,8 +265,6 @@ export default Vue.extend({
     enableCliPing: function () {
       const v = this
       electron.ipcRenderer.on('ping', function (event, message) {
-        console.log('ping!')
-        console.log(message)
         let url = message[message.length - 1]
         if (url) {
           url = url.replace('freetube://', '')
diff --git a/src/renderer/components/distraction-settings/distraction-settings.js b/src/renderer/components/distraction-settings/distraction-settings.js
index 104c1edc2..22a1f7d4e 100644
--- a/src/renderer/components/distraction-settings/distraction-settings.js
+++ b/src/renderer/components/distraction-settings/distraction-settings.js
@@ -42,6 +42,15 @@ export default Vue.extend({
     }
   },
   methods: {
+    handleHideRecommendedVideos: function (value) {
+      if (value) {
+        this.updatePlayNextVideo(false)
+        this.updateDefaultTheatreMode(true)
+      }
+
+      this.updateHideRecommendedVideos(value)
+    },
+
     ...mapActions([
       'updateHideVideoViews',
       'updateHideVideoLikesAndDislikes',
@@ -50,7 +59,9 @@ export default Vue.extend({
       'updateHideRecommendedVideos',
       'updateHideTrendingVideos',
       'updateHidePopularVideos',
-      'updateHideLiveChat'
+      'updateHideLiveChat',
+      'updatePlayNextVideo',
+      'updateDefaultTheatreMode'
     ])
   }
 })
diff --git a/src/renderer/components/distraction-settings/distraction-settings.vue b/src/renderer/components/distraction-settings/distraction-settings.vue
index 0f9dfede5..26707279c 100644
--- a/src/renderer/components/distraction-settings/distraction-settings.vue
+++ b/src/renderer/components/distraction-settings/distraction-settings.vue
@@ -39,7 +39,7 @@
           :label="$t('Settings.Distraction Free Settings.Hide Recommended Videos')"
           :compact="true"
           :default-value="hideRecommendedVideos"
-          @change="updateHideRecommendedVideos"
+          @change="handleHideRecommendedVideos"
         />
         <ft-toggle-switch
           :label="$t('Settings.Distraction Free Settings.Hide Trending Videos')"
diff --git a/src/renderer/components/ft-profile-selector/ft-profile-selector.js b/src/renderer/components/ft-profile-selector/ft-profile-selector.js
index 3cd2f8a4c..c31fed6bd 100644
--- a/src/renderer/components/ft-profile-selector/ft-profile-selector.js
+++ b/src/renderer/components/ft-profile-selector/ft-profile-selector.js
@@ -36,16 +36,6 @@ export default Vue.extend({
     }
   },
   mounted: function () {
-    setTimeout(() => {
-      const profileIndex = this.profileList.findIndex((profile) => {
-        return profile._id === this.defaultProfile
-      })
-
-      if (profileIndex !== -1) {
-        this.updateActiveProfile(profileIndex)
-      }
-    }, 200)
-
     $('#profileList').focusout(() => {
       $('#profileList')[0].style.display = 'none'
     })
diff --git a/src/renderer/components/ft-toggle-switch/ft-toggle-switch.js b/src/renderer/components/ft-toggle-switch/ft-toggle-switch.js
index 4a5bd8250..775b91c13 100644
--- a/src/renderer/components/ft-toggle-switch/ft-toggle-switch.js
+++ b/src/renderer/components/ft-toggle-switch/ft-toggle-switch.js
@@ -14,6 +14,10 @@ export default Vue.extend({
     compact: {
       type: Boolean,
       default: false
+    },
+    disabled: {
+      type: Boolean,
+      default: false
     }
   },
   data: function () {
diff --git a/src/renderer/components/ft-toggle-switch/ft-toggle-switch.sass b/src/renderer/components/ft-toggle-switch/ft-toggle-switch.sass
index c52f0574e..04cc48364 100644
--- a/src/renderer/components/ft-toggle-switch/ft-toggle-switch.sass
+++ b/src/renderer/components/ft-toggle-switch/ft-toggle-switch.sass
@@ -50,6 +50,9 @@
     .switch-input:checked + &
       background-color: var(--accent-color-light)
 
+    .switch-input:disabled + &
+      background-color: #9E9E9E
+
   &:after
     left: 0
     width: 20px
@@ -63,3 +66,6 @@
       -ms-transform: translate(80%, -50%)
       -webkit-transform: translate(80%, -50%)
       transform: translate(80%, -50%)
+
+    .switch-input:disabled + &
+      background-color: #BDBDBD
diff --git a/src/renderer/components/ft-toggle-switch/ft-toggle-switch.vue b/src/renderer/components/ft-toggle-switch/ft-toggle-switch.vue
index 56bdb321f..daa2ec768 100644
--- a/src/renderer/components/ft-toggle-switch/ft-toggle-switch.vue
+++ b/src/renderer/components/ft-toggle-switch/ft-toggle-switch.vue
@@ -10,6 +10,7 @@
       name="set-name"
       class="switch-input"
       :checked="currentValue"
+      :disabled="disabled"
       @change="$emit('change', currentValue)"
     >
     <label
diff --git a/src/renderer/components/player-settings/player-settings.js b/src/renderer/components/player-settings/player-settings.js
index a0622b76d..a50a710b1 100644
--- a/src/renderer/components/player-settings/player-settings.js
+++ b/src/renderer/components/player-settings/player-settings.js
@@ -78,6 +78,10 @@ export default Vue.extend({
       return this.$store.getters.getDefaultTheatreMode
     },
 
+    hideRecommendedVideos: function () {
+      return this.$store.getters.getHideRecommendedVideos
+    },
+
     formatNames: function () {
       return [
         this.$t('Settings.Player Settings.Default Video Format.Dash Formats'),
diff --git a/src/renderer/components/player-settings/player-settings.vue b/src/renderer/components/player-settings/player-settings.vue
index db3d49671..f45e2532e 100644
--- a/src/renderer/components/player-settings/player-settings.vue
+++ b/src/renderer/components/player-settings/player-settings.vue
@@ -31,6 +31,7 @@
         <ft-toggle-switch
           :label="$t('Settings.Player Settings.Enable Theatre Mode by Default')"
           :compact="true"
+          :disabled="hideRecommendedVideos"
           :default-value="defaultTheatreMode"
           @change="updateDefaultTheatreMode"
         />
@@ -51,6 +52,7 @@
         <ft-toggle-switch
           :label="$t('Settings.Player Settings.Play Next Video')"
           :compact="true"
+          :disabled="hideRecommendedVideos"
           :default-value="playNextVideo"
           @change="updatePlayNextVideo"
         />
diff --git a/src/renderer/components/privacy-settings/privacy-settings.js b/src/renderer/components/privacy-settings/privacy-settings.js
index 836fc7460..53b4421fd 100644
--- a/src/renderer/components/privacy-settings/privacy-settings.js
+++ b/src/renderer/components/privacy-settings/privacy-settings.js
@@ -58,6 +58,14 @@ export default Vue.extend({
       }
     },
 
+    handleRememberHistory: function (value) {
+      if (!value) {
+        this.updateSaveWatchedProgress(false)
+      }
+
+      this.updateRememberHistory(value)
+    },
+
     handleRemoveHistory: function (option) {
       this.showRemoveHistoryPrompt = false
 
diff --git a/src/renderer/components/privacy-settings/privacy-settings.vue b/src/renderer/components/privacy-settings/privacy-settings.vue
index 1cb1233a0..e0191eda0 100644
--- a/src/renderer/components/privacy-settings/privacy-settings.vue
+++ b/src/renderer/components/privacy-settings/privacy-settings.vue
@@ -11,13 +11,14 @@
           :label="$t('Settings.Privacy Settings.Remember History')"
           :compact="true"
           :default-value="rememberHistory"
-          @change="updateRememberHistory"
+          @change="handleRememberHistory"
         />
       </div>
       <div class="switchColumn">
         <ft-toggle-switch
           :label="$t('Settings.Privacy Settings.Save Watched Progress')"
           :compact="true"
+          :disabled="!rememberHistory"
           :default-value="saveWatchedProgress"
           @change="updateSaveWatchedProgress"
         />
diff --git a/src/renderer/components/watch-video-info/watch-video-info.js b/src/renderer/components/watch-video-info/watch-video-info.js
index 41c40c82f..1fedb560b 100644
--- a/src/renderer/components/watch-video-info/watch-video-info.js
+++ b/src/renderer/components/watch-video-info/watch-video-info.js
@@ -95,6 +95,10 @@ export default Vue.extend({
       return this.$store.getters.getActiveProfile
     },
 
+    hideRecommendedVideos: function () {
+      return this.$store.getters.getHideRecommendedVideos
+    },
+
     formatTypeNames: function () {
       return [
         this.$t('Change Format.Use Dash Formats').toUpperCase(),
diff --git a/src/renderer/components/watch-video-info/watch-video-info.vue b/src/renderer/components/watch-video-info/watch-video-info.vue
index 32ecc609e..13ac86301 100644
--- a/src/renderer/components/watch-video-info/watch-video-info.vue
+++ b/src/renderer/components/watch-video-info/watch-video-info.vue
@@ -60,6 +60,7 @@
       </div>
       <div class="videoOptions">
         <ft-icon-button
+          v-if="!hideRecommendedVideos"
           :title="$t('Toggle Theatre Mode')"
           class="theatreModeButton option"
           icon="expand-alt"
diff --git a/src/renderer/store/modules/profile.js b/src/renderer/store/modules/profile.js
index 984ab5eca..6e0f0eb20 100644
--- a/src/renderer/store/modules/profile.js
+++ b/src/renderer/store/modules/profile.js
@@ -46,7 +46,7 @@ const getters = {
 }
 
 const actions = {
-  grabAllProfiles ({ dispatch, commit }, defaultName = null) {
+  grabAllProfiles ({ rootState, dispatch, commit }, defaultName = null) {
     profileDb.find({}, (err, results) => {
       if (!err) {
         if (results.length === 0) {
@@ -65,6 +65,17 @@ const actions = {
 
             return b.name - a.name
           })
+
+          if (state.profileList.length < profiles.length) {
+            const profileIndex = profiles.findIndex((profile) => {
+              return profile._id === rootState.settings.defaultProfile
+            })
+
+            if (profileIndex !== -1) {
+              dispatch('updateActiveProfile', profileIndex)
+            }
+          }
+
           commit('setProfileList', profiles)
         }
       }