diff --git a/src/slic3r/GUI/DeviceTab/uiAmsHumidityPopup.cpp b/src/slic3r/GUI/DeviceTab/uiAmsHumidityPopup.cpp
index a52a925aba..86b78f0933 100644
--- a/src/slic3r/GUI/DeviceTab/uiAmsHumidityPopup.cpp
+++ b/src/slic3r/GUI/DeviceTab/uiAmsHumidityPopup.cpp
@@ -20,7 +20,7 @@
 namespace Slic3r { namespace GUI {
 
 uiAmsPercentHumidityDryPopup::uiAmsPercentHumidityDryPopup(wxWindow *parent)
-    : PopupWindow(parent, wxBORDER_NONE)
+    : wxDialog(parent, wxID_ANY, "")
 {
     Create();
 }
@@ -42,14 +42,9 @@ void uiAmsPercentHumidityDryPopup::Create()
     title->SetBackgroundColour(*wxWHITE);
     title->SetFont(Label::Head_18);
 
-    m_close_btn = new ScalableButton(this, wxID_ANY, "hum_popup_close");
-    m_close_btn->SetBackgroundColour(*wxWHITE);
-    m_close_btn->Bind(wxEVT_LEFT_UP, [this](auto& e) { Dismiss(); e.Skip(); });
     title_sizer->AddStretchSpacer();
     title_sizer->Add(title, 0, wxALIGN_CENTER_HORIZONTAL);
     title_sizer->AddStretchSpacer();
-    title_sizer->Add(m_close_btn, 0, wxALIGN_RIGHT, 0);
-    title_sizer->AddSpacer(FromDIP(10));
 
     // create humidity image
     m_humidity_img = new wxStaticBitmap(this, wxID_ANY, wxNullBitmap);
@@ -173,7 +168,6 @@ void uiAmsPercentHumidityDryPopup::msw_rescale()
 {
     idle_img.msw_rescale();
     drying_img.msw_rescale();
-    m_close_btn->msw_rescale();
     UpdateContents();
 }
 
diff --git a/src/slic3r/GUI/DeviceTab/uiAmsHumidityPopup.h b/src/slic3r/GUI/DeviceTab/uiAmsHumidityPopup.h
index 1de5dd818a..7fd5a98f72 100644
--- a/src/slic3r/GUI/DeviceTab/uiAmsHumidityPopup.h
+++ b/src/slic3r/GUI/DeviceTab/uiAmsHumidityPopup.h
@@ -29,7 +29,7 @@ struct uiAmsHumidityInfo
 /// Note: The popup of Ams Humidity with percentage and dry time
 /// Author: xin.zhang
 /// </summary>
-class uiAmsPercentHumidityDryPopup : public PopupWindow
+class uiAmsPercentHumidityDryPopup : public wxDialog
 {
 public:
     uiAmsPercentHumidityDryPopup(wxWindow *parent);
@@ -40,9 +40,6 @@ public:
 
     std::string get_owner_ams_id() const { return m_ams_id; }
 
-    virtual void OnDismiss() wxOVERRIDE {};
-    virtual bool ProcessLeftDown(wxMouseEvent &event) wxOVERRIDE { return true;};
-
     void msw_rescale();
 
 private:
@@ -65,7 +62,6 @@ private:
     ScalableBitmap idle_img;
 
     // Widgets
-    ScalableButton* m_close_btn;
     wxStaticBitmap* m_humidity_img;
 
     wxStaticBitmap* m_dry_state_img;
diff --git a/src/slic3r/GUI/Widgets/AMSControl.cpp b/src/slic3r/GUI/Widgets/AMSControl.cpp
index 1cb083b699..8816c9b915 100644
--- a/src/slic3r/GUI/Widgets/AMSControl.cpp
+++ b/src/slic3r/GUI/Widgets/AMSControl.cpp
@@ -40,7 +40,6 @@ AMSControl::AMSControl(wxWindow *parent, wxWindowID id, const wxPoint &pos, cons
     wxBoxSizer *m_sizer_body = new wxBoxSizer(wxVERTICAL);
     m_amswin                 = new wxWindow(this, wxID_ANY);
     m_amswin->SetBackgroundColour(*wxWHITE);
-    //m_amswin->SetBackgroundColour(wxColour(0x00CED1));
     m_amswin->SetSize(wxSize(FromDIP(578), -1));
     m_amswin->SetMinSize(wxSize(FromDIP(578), -1));
 
@@ -285,8 +284,8 @@ AMSControl::AMSControl(wxWindow *parent, wxWindowID id, const wxPoint &pos, cons
 
                 wxPoint img_pos = ClientToScreen(wxPoint(0, 0));
                 wxPoint popup_pos(img_pos.x - m_percent_humidity_dry_popup->GetSize().GetWidth() + FromDIP(150), img_pos.y - FromDIP(80));
-                m_percent_humidity_dry_popup->Position(popup_pos, wxSize(0, 0));
-                m_percent_humidity_dry_popup->Popup();
+                m_percent_humidity_dry_popup->Move(popup_pos);
+                m_percent_humidity_dry_popup->ShowModal();
             }
             else
             {