diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp
index 5c83e192d..d367f1f19 100644
--- a/src/slic3r/GUI/Plater.cpp
+++ b/src/slic3r/GUI/Plater.cpp
@@ -4039,11 +4039,11 @@ void Plater::priv::on_select_preset(wxCommandEvent &evt)
             // revert previously selection
             const std::string& old_name = wxGetApp().preset_bundle->filaments.get_edited_preset().name;
             wxGetApp().preset_bundle->set_filament_preset(idx, old_name);
-            combo->update();
         }
         else
             // Synchronize config.ini with the current selections.
             wxGetApp().preset_bundle->export_selections(*wxGetApp().app_config);
+        combo->update();
     }
     else if (select_preset) {
         wxWindowUpdateLocker noUpdates(sidebar->presets_panel());
diff --git a/src/slic3r/GUI/PresetComboBoxes.cpp b/src/slic3r/GUI/PresetComboBoxes.cpp
index f5496833a..7a2e0de69 100644
--- a/src/slic3r/GUI/PresetComboBoxes.cpp
+++ b/src/slic3r/GUI/PresetComboBoxes.cpp
@@ -820,6 +820,8 @@ void PlaterPresetComboBox::update()
             // Extruder color is not defined.
             extruder_color.clear();
         selected_filament_preset = extruder_filaments.get_selected_preset();
+        if (selected_filament_preset->is_dirty)
+            selected_filament_preset = &m_preset_bundle->filaments.get_edited_preset();
         assert(selected_filament_preset);
     }