diff --git a/client/src/assets/player/shared/peertube/peertube-plugin.ts b/client/src/assets/player/shared/peertube/peertube-plugin.ts
index c405e37e0..6c83d22bf 100644
--- a/client/src/assets/player/shared/peertube/peertube-plugin.ts
+++ b/client/src/assets/player/shared/peertube/peertube-plugin.ts
@@ -310,8 +310,6 @@ class PeerTubePlugin extends Plugin {
   private setInactivityTimeout (timeout: number) {
     (this.player as any).cache_.inactivityTimeout = timeout
     this.player.options_.inactivityTimeout = timeout
-
-    debugLogger('Set player inactivity to ' + timeout)
   }
 
   private initCaptions () {
diff --git a/client/src/assets/player/shared/settings/resolution-menu-button.ts b/client/src/assets/player/shared/settings/resolution-menu-button.ts
index c39894284..ac947fdb1 100644
--- a/client/src/assets/player/shared/settings/resolution-menu-button.ts
+++ b/client/src/assets/player/shared/settings/resolution-menu-button.ts
@@ -64,7 +64,7 @@ class ResolutionMenuButton extends MenuButton {
   update () {
     super.update()
 
-    this.trigger('menu-changed')
+    this.trigger('resolution-menu-changed')
   }
 
   buildCSSClass () {
diff --git a/client/src/assets/player/shared/settings/settings-menu-item.ts b/client/src/assets/player/shared/settings/settings-menu-item.ts
index 9916ae27f..9e4ad59c8 100644
--- a/client/src/assets/player/shared/settings/settings-menu-item.ts
+++ b/client/src/assets/player/shared/settings/settings-menu-item.ts
@@ -1,3 +1,4 @@
+import debug from 'debug'
 import videojs from 'video.js'
 import { toTitleCase } from '../common'
 import { SettingsDialog } from './settings-dialog'
@@ -5,8 +6,16 @@ import { SettingsButton } from './settings-menu-button'
 import { SettingsPanel } from './settings-panel'
 import { SettingsPanelChild } from './settings-panel-child'
 
+const debugLogger = debug('peertube:player:settings')
+
 const MenuItem = videojs.getComponent('MenuItem')
-const component = videojs.getComponent('Component')
+const Component = videojs.getComponent('Component')
+
+interface MenuItemExtended extends videojs.MenuItem {
+  isSelected_: boolean
+
+  getLabel?: () => string
+}
 
 export interface SettingsMenuItemOptions extends videojs.MenuItemOptions {
   entry: string
@@ -76,15 +85,15 @@ class SettingsMenuItem extends MenuItem {
 
         if (subMenuName === 'CaptionsButton') {
           player.on('captions-changed', () => {
-            // Wait menu component rebuild
-            setTimeout(() => {
-              this.rebuildAfterMenuChange()
-            }, 150)
+            setTimeout(() => this.rebuildAfterMenuChange())
           })
+
+          // Needed because 'captions-changed' event doesn't contain the selected caption yet
+          player.on('texttrackchange', this.submenuClickHandler)
         }
 
         if (subMenuName === 'ResolutionMenuButton') {
-          this.subMenu.on('menu-changed', () => {
+          this.subMenu.on('resolution-menu-changed', () => {
             this.rebuildAfterMenuChange()
           })
         }
@@ -261,34 +270,28 @@ class SettingsMenuItem extends MenuItem {
   }
 
   update (event?: any) {
-    const subMenu = this.subMenu.name()
-
     // Playback rate menu button doesn't get a vjs-selected class
     // or sets options_['selected'] on the selected playback rate.
     // Thus we get the submenu value based on the labelEl of playbackRateMenuButton
-    if (subMenu === 'PlaybackRateMenuButton') {
-      const html = (this.subMenu as any).labelEl_.innerHTML
-
-      setTimeout(() => {
-        this.settingsSubMenuValueEl_.innerHTML = html
-      }, 250)
+    if (this.subMenu.name() === 'PlaybackRateMenuButton') {
+      this.settingsSubMenuValueEl_.innerHTML = (this.subMenu as any).labelEl_.textContent
     } else {
       // Loop through the submenu items to find the selected child
       for (const subMenuItem of this.subMenu.menu.children_) {
-        if (!(subMenuItem instanceof component)) {
+        if (!(subMenuItem instanceof MenuItem)) {
           continue
         }
 
-        if (subMenuItem.hasClass('vjs-selected')) {
-          const subMenuItemUntyped = subMenuItem as any
+        const subMenuItemExtended = subMenuItem as MenuItemExtended
+        if (subMenuItemExtended.isSelected_) {
 
           // Prefer to use the function
-          if (typeof subMenuItemUntyped.getLabel === 'function') {
-            this.settingsSubMenuValueEl_.innerHTML = subMenuItemUntyped.getLabel()
+          if (typeof subMenuItemExtended.getLabel === 'function') {
+            this.settingsSubMenuValueEl_.innerHTML = subMenuItemExtended.getLabel()
             break
           }
 
-          this.settingsSubMenuValueEl_.innerHTML = this.player().localize(subMenuItemUntyped.options_.label)
+          this.settingsSubMenuValueEl_.innerHTML = this.player().localize(subMenuItemExtended.options_.label)
         }
       }
     }
@@ -307,7 +310,7 @@ class SettingsMenuItem extends MenuItem {
 
   bindClickEvents () {
     for (const item of this.subMenu.menu.children()) {
-      if (!(item instanceof component)) {
+      if (!(item instanceof Component)) {
         continue
       }
       item.on([ 'tap', 'click' ], this.submenuClickHandler)
@@ -349,6 +352,8 @@ class SettingsMenuItem extends MenuItem {
   }
 
   private rebuildAfterMenuChange () {
+    debugLogger('Rebuilding menu ' + this.subMenu.name() + ' after change')
+
     this.settingsSubMenuEl_.innerHTML = ''
     this.settingsSubMenuEl_.appendChild(this.subMenu.menu.el())
     this.update()
diff --git a/client/src/sass/player/settings-menu.scss b/client/src/sass/player/settings-menu.scss
index 369c827f7..cc3cdedb6 100644
--- a/client/src/sass/player/settings-menu.scss
+++ b/client/src/sass/player/settings-menu.scss
@@ -121,7 +121,7 @@ $setting-transition-easing: ease-out;
           padding: 5px 8px;
 
           &.vjs-back-button {
-            padding: 8px 8px 13px 12px;
+            padding: 12px 8px;
             margin-bottom: 5px;
             border-bottom: 1px solid #808080;
             text-align: start;
@@ -129,7 +129,7 @@ $setting-transition-easing: ease-out;
             &::before {
               @include chevron-left(9px, 2px);
 
-              @include margin-right(5px);
+              @include margin-right(10px);
             }
           }