diff --git a/src/slic3r/GUI/GUI_App.cpp b/src/slic3r/GUI/GUI_App.cpp
index 6d04c06ba0..362db930ba 100644
--- a/src/slic3r/GUI/GUI_App.cpp
+++ b/src/slic3r/GUI/GUI_App.cpp
@@ -2130,6 +2130,7 @@ bool GUI_App::on_init_inner()
     // initialize label colors and fonts
     init_label_colours();
     init_fonts();
+    wxGetApp().Update_dark_mode_flag();
 
 
 #ifdef _MSW_DARK_MODE
@@ -2721,8 +2722,9 @@ void GUI_App::UpdateDarkUI(wxWindow* window, bool highlited/* = false*/, bool ju
             return;
     }
 
-    if (m_is_dark_mode != dark_mode() )
-        m_is_dark_mode = dark_mode();
+
+    /*if (m_is_dark_mode != dark_mode() )
+        m_is_dark_mode = dark_mode();*/
     
 
     if (m_is_dark_mode) {
@@ -2778,6 +2780,11 @@ void GUI_App::UpdateDarkUIWin(wxWindow* win)
     update_dark_children_ui(win);
 }
 
+void GUI_App::Update_dark_mode_flag()
+{
+    m_is_dark_mode = dark_mode();
+}
+
 void GUI_App::UpdateDlgDarkUI(wxDialog* dlg)
 {
 #ifdef __WINDOWS__
diff --git a/src/slic3r/GUI/GUI_App.hpp b/src/slic3r/GUI/GUI_App.hpp
index 2e28b81d11..397f215efd 100644
--- a/src/slic3r/GUI/GUI_App.hpp
+++ b/src/slic3r/GUI/GUI_App.hpp
@@ -324,6 +324,7 @@ public:
     // update color mode for window
     void            UpdateDarkUI(wxWindow *window, bool highlited = false, bool just_font = false);
     void            UpdateDarkUIWin(wxWindow* win);
+    void            Update_dark_mode_flag();
     // update color mode for whole dialog including all children
     void            UpdateDlgDarkUI(wxDialog* dlg);
     void            UpdateFrameDarkUI(wxFrame* dlg);
diff --git a/src/slic3r/GUI/GUI_Utils.cpp b/src/slic3r/GUI/GUI_Utils.cpp
index 57948ca041..7cc0a6bc56 100644
--- a/src/slic3r/GUI/GUI_Utils.cpp
+++ b/src/slic3r/GUI/GUI_Utils.cpp
@@ -273,6 +273,7 @@ void update_dark_config()
     wxSystemAppearance app = wxSystemSettings::GetAppearance();
     GUI::wxGetApp().app_config->set("dark_color_mode", app.IsDark() ? "1" : "0");
     GUI::wxGetApp().app_config->save();
+    wxGetApp().Update_dark_mode_flag();
 }
 
 
diff --git a/src/slic3r/GUI/MainFrame.cpp b/src/slic3r/GUI/MainFrame.cpp
index fc59350d83..2e551e5621 100644
--- a/src/slic3r/GUI/MainFrame.cpp
+++ b/src/slic3r/GUI/MainFrame.cpp
@@ -1911,7 +1911,7 @@ static wxMenu* generate_help_menu()
 
 static void add_common_publish_menu_items(wxMenu* publish_menu, MainFrame* mainFrame)
 {
-#ifdef __APPLE__ || __LINUX__
+#ifndef __WINDOWS__
     append_menu_item(publish_menu, wxID_ANY, _L("Upload Models"), _L("Upload Models"),
         [](wxCommandEvent&) {
             if (!wxGetApp().getAgent()) {
diff --git a/src/slic3r/GUI/Preferences.cpp b/src/slic3r/GUI/Preferences.cpp
index 01a97a4c3d..c18b19bc00 100644
--- a/src/slic3r/GUI/Preferences.cpp
+++ b/src/slic3r/GUI/Preferences.cpp
@@ -491,6 +491,7 @@ wxBoxSizer* PreferencesDialog::create_item_darkmode_checkbox(wxString title, wxW
     checkbox->Bind(wxEVT_TOGGLEBUTTON, [this, checkbox, param](wxCommandEvent& e) {
         app_config->set(param, checkbox->GetValue() ? "1" : "0");
         app_config->save();
+        wxGetApp().Update_dark_mode_flag();
 
         //dark mode
 #ifdef _MSW_DARK_MODE
diff --git a/src/slic3r/GUI/WebUserLoginDialog.cpp b/src/slic3r/GUI/WebUserLoginDialog.cpp
index 5e7cd7cdf6..e6a7a3757f 100644
--- a/src/slic3r/GUI/WebUserLoginDialog.cpp
+++ b/src/slic3r/GUI/WebUserLoginDialog.cpp
@@ -113,6 +113,8 @@ ZUserLogin::ZUserLogin() : wxDialog((wxWindow *) (wxGetApp().mainframe), wxID_AN
 
     //Param
     m_AutotestToken = "";
+
+    wxGetApp().UpdateDlgDarkUI(this);
 }
 
 ZUserLogin::~ZUserLogin() {