diff --git a/src/js/main.js b/src/js/main.js
index bc89bd70..2be0cefb 100644
--- a/src/js/main.js
+++ b/src/js/main.js
@@ -501,12 +501,12 @@ function startProcess() {
     });
 
     ConfigStorage.get('permanentExpertMode', function (result) {
-        const experModeCheckbox = 'input[name="expertModeCheckbox"]';
+        const expertModeCheckbox = 'input[name="expertModeCheckbox"]';
         if (result.permanentExpertMode) {
-            $(experModeCheckbox).prop('checked', true);
+            $(expertModeCheckbox).prop('checked', true);
         }
 
-        $(experModeCheckbox).change(function () {
+        $(expertModeCheckbox).change(function () {
             const checked = $(this).is(':checked');
             checkSetupAnalytics(function (analyticsService) {
                 analyticsService.setDimension(analyticsService.DIMENSIONS.CONFIGURATOR_EXPERT_MODE, checked ? 'On' : 'Off');
diff --git a/src/js/tabs/firmware_flasher.js b/src/js/tabs/firmware_flasher.js
index e2e76c5b..52cda162 100644
--- a/src/js/tabs/firmware_flasher.js
+++ b/src/js/tabs/firmware_flasher.js
@@ -376,7 +376,7 @@ firmware_flasher.initialize = function (callback) {
         function showOrHideBuildTypeSelect() {
             const expertModeChecked = $(this).is(':checked');
 
-            globalExpertMode_e.prop('checked', expertModeChecked);
+            globalExpertMode_e.prop('checked', expertModeChecked).trigger('change');
             if (expertModeChecked) {
                 buildTypesToShow = buildTypes.concat(ciBuildsTypes);
                 buildBuildTypeOptionsList();