diff --git a/src/libslic3r/AppConfig.cpp b/src/libslic3r/AppConfig.cpp
index 26c5b470e3..fd2c4f8651 100644
--- a/src/libslic3r/AppConfig.cpp
+++ b/src/libslic3r/AppConfig.cpp
@@ -85,9 +85,6 @@ void AppConfig::set_defaults()
         if (get("associate_stl").empty())
             set("associate_stl", "0");
 
-        if (get("dark_color_mode").empty())
-            set("dark_color_mode", "0");
-
         if (get("tabs_as_menu").empty())
             set("tabs_as_menu", "0");
 #endif // _WIN32
@@ -179,6 +176,9 @@ void AppConfig::set_defaults()
 #ifdef _WIN32
     if (get("use_legacy_3DConnexion").empty())
         set("use_legacy_3DConnexion", "0");
+
+    if (get("dark_color_mode").empty())
+        set("dark_color_mode", "0");
 #endif // _WIN32
 
     // Remove legacy window positions/sizes
diff --git a/src/slic3r/GUI/Preferences.cpp b/src/slic3r/GUI/Preferences.cpp
index 880723693c..9d12369227 100644
--- a/src/slic3r/GUI/Preferences.cpp
+++ b/src/slic3r/GUI/Preferences.cpp
@@ -343,6 +343,7 @@ void PreferencesDialog::build(size_t selected_tab)
 		m_optgroup_gui->append_single_option_line(option);
 
 #ifdef _MSW_DARK_MODE
+	}
 		def.label = L("Use Dark color mode (experimental)");
 		def.type = coBool;
 		def.tooltip = L("If enabled, UI will use Dark mode colors. "
@@ -351,6 +352,7 @@ void PreferencesDialog::build(size_t selected_tab)
 		option = Option(def, "dark_color_mode");
 		m_optgroup_gui->append_single_option_line(option);
 
+	if (is_editor) {
 		def.label = L("Set settings tabs as menu items (experimental)");
 		def.type = coBool;
 		def.tooltip = L("If enabled, Settings Tabs will be placed as menu items. "