diff --git a/src/slic3r/GUI/SelectMachine.cpp b/src/slic3r/GUI/SelectMachine.cpp
index 74110f5bf..29c0388e6 100644
--- a/src/slic3r/GUI/SelectMachine.cpp
+++ b/src/slic3r/GUI/SelectMachine.cpp
@@ -5006,8 +5006,11 @@ void SendModeSwitchButton::on_left_down(wxMouseEvent &evt)
 
 void SendModeSwitchButton::setSelected(bool selected)
 {
-    is_selected = selected;
-    Refresh();
+    if (is_selected != selected)
+    {
+        is_selected = selected;
+        Refresh();
+    }
 }
 
 }} // namespace Slic3r::GUI
diff --git a/src/slic3r/GUI/Widgets/FanControl.cpp b/src/slic3r/GUI/Widgets/FanControl.cpp
index b689de252..813a66ff5 100644
--- a/src/slic3r/GUI/Widgets/FanControl.cpp
+++ b/src/slic3r/GUI/Widgets/FanControl.cpp
@@ -680,6 +680,8 @@ void FanControlPopupNew::CreateDuct()
 
 void FanControlPopupNew::UpdateParts(int mode_id)
 {
+    Freeze();
+
     m_sizer_fanControl->Clear(true);
     for (const auto& part : m_data.parts) {
 
@@ -698,6 +700,7 @@ void FanControlPopupNew::UpdateParts(int mode_id)
     }
 
     m_sizer_fanControl->Layout();
+    Thaw();
 }
 
 void FanControlPopupNew::UpdateTips(int model)