diff --git a/html5/index.html b/html5/index.html
index e29c378..f14d19f 100644
--- a/html5/index.html
+++ b/html5/index.html
@@ -501,9 +501,9 @@ experiments:
         console.log("[GET-PRESETS] Loaded preset for " + tool);
         loadPresetsCodeParsed = JSON.parse(loadPresetsCodeJson);
         decodedStringAtoB = atob(loadPresetsCodeParsed[tool]);
-        loadSavedPreset(tool, lang, decodedStringAtoB);
         latest_preset_name = tool;
         latest_preset_lang = lang;
+        loadSavedPreset(tool, lang, decodedStringAtoB);
         $("#presetLang").val(lang);
         $("#presetName").val(tool);
         $('#setLoadTestModal').modal('show');
diff --git a/html5/kubeinvaders.js b/html5/kubeinvaders.js
index b2c2076..87727e1 100644
--- a/html5/kubeinvaders.js
+++ b/html5/kubeinvaders.js
@@ -134,7 +134,7 @@ function getSavedPresets() {
                 for (i = 0; i < savedPresets.length; i++) {
                     var currentPresetName = savedPresets[i].split("_")[1];
                     currentPresetName = currentPresetName.charAt(0).toUpperCase() + currentPresetName.slice(1);
-                    console.log("[GET-PRESETS] currentPresetName: " + currentPresetName);
+                    //console.log("[GET-PRESETS] computing preset: " + currentPresetName);
                     var buttonId = "load" + currentPresetName.trim();
                     console.log("[GET-PRESETS] Change border color of buttonId: " + buttonId);
                     document.getElementById(buttonId).classList.remove('btn-light');
@@ -229,6 +229,11 @@ experiments:
     oReq.send(presetBody);
     closeSetLoadTestModal();
     
+    let presetNameCapitalized = presetName.charAt(0).toUpperCase() + presetName.slice(1);
+    var buttonId = "load" + presetNameCapitalized.trim();
+    document.getElementById(buttonId).classList.remove('btn-light');
+    document.getElementById(buttonId).classList.add('btn-light-saved');
+
     getSavedPresets();
 
     if (action == "apply" && programming_mode_switch == false){