diff --git a/src/slic3r/GUI/StatusPanel.cpp b/src/slic3r/GUI/StatusPanel.cpp
index d59f07f5cc..f6783f4127 100644
--- a/src/slic3r/GUI/StatusPanel.cpp
+++ b/src/slic3r/GUI/StatusPanel.cpp
@@ -1091,7 +1091,10 @@ void StatusBasePanel::show_ams_group(bool show, bool support_virtual_tray)
     m_ams_control->Show(true);
     m_ams_control_box->Show(true);
     m_ams_control->show_noams_mode(show, support_virtual_tray);
-    Fit();
+
+    if (m_show_ams_group != show) {
+        Fit();
+    }
     m_show_ams_group = show;
 }
 
diff --git a/src/slic3r/GUI/Widgets/ImageSwitchButton.cpp b/src/slic3r/GUI/Widgets/ImageSwitchButton.cpp
index 7240cc42a9..2cba878f7a 100644
--- a/src/slic3r/GUI/Widgets/ImageSwitchButton.cpp
+++ b/src/slic3r/GUI/Widgets/ImageSwitchButton.cpp
@@ -312,6 +312,7 @@ void FanSwitchButton::render(wxDC& dc)
         dc.SetTextForeground(text_color.colorForStates(states));
 
     pt.x = (size.x - dc.GetTextExtent(speed).x) / 2;
+    pt.y -= FromDIP(5);
     dc.DrawText(speed, pt);
 }