diff --git a/src/slic3r/GUI/GUI_Factories.cpp b/src/slic3r/GUI/GUI_Factories.cpp
index 4119b3a86..76a93c2a1 100644
--- a/src/slic3r/GUI/GUI_Factories.cpp
+++ b/src/slic3r/GUI/GUI_Factories.cpp
@@ -58,7 +58,7 @@ static SettingsFactory::Bundle FREQ_SETTINGS_BUNDLE_FFF =
                                     "support_base_pattern", "support_on_build_plate_only","support_critical_regions_only",
                                     "support_base_pattern_spacing" } },
     //BBS
-    //{ L("Flush options")         , { "flush_into_infill", "flush_into_objects", "flush_into_support"} }
+    { L("Flush options")         , { "flush_into_infill", "flush_into_objects", "flush_into_support"} }
 };
 
 // pt_SLA
@@ -749,10 +749,7 @@ void MenuFactory::append_menu_items_flush_options(wxMenu* menu)
     ModelConfig& select_object_config = object_list->object(selection.get_object_idx())->config;
     
     auto keys = select_object_config.keys();
-
-    DynamicPrintConfig& global_config = wxGetApp().preset_bundle->prints.get_edited_preset().config;
-
-    for (auto key : { "flush_into_infill" , "flush_into_objects" ,"flush_into_support" }) {
+    for (auto key : FREQ_SETTINGS_BUNDLE_FFF["Flush options"]) {
         if (find(keys.begin(), keys.end(), key) == keys.end()) {
             const ConfigOption* option = global_config.option(key);
             select_object_config.set_key_value(key, option->clone());
@@ -763,24 +760,24 @@ void MenuFactory::append_menu_items_flush_options(wxMenu* menu)
     wxMenu* flush_options_menu = new wxMenu();
     append_menu_check_item(flush_options_menu, wxID_ANY, _L("Flush into objects' infill"), "",
         [&select_object_config](wxCommandEvent&) {
-            const ConfigOption* option = select_object_config.option("flush_into_infill");
-            select_object_config.set_key_value("flush_into_infill", new ConfigOptionBool(!option->getBool()));
+            const ConfigOption* option = select_object_config.option(FREQ_SETTINGS_BUNDLE_FFF["Flush options"][0]);
+            select_object_config.set_key_value(FREQ_SETTINGS_BUNDLE_FFF["Flush options"][0], new ConfigOptionBool(!option->getBool()));
             wxGetApp().obj_settings()->UpdateAndShow(true);
-        }, menu, []() {return true; }, [&select_object_config]() {const ConfigOption* option = select_object_config.option("flush_into_infill"); return option->getBool(); }, m_parent);
+        }, menu, []() {return true; }, [&select_object_config]() {const ConfigOption* option = select_object_config.option(FREQ_SETTINGS_BUNDLE_FFF["Flush options"][0]); return option->getBool(); }, m_parent);
 
     append_menu_check_item(flush_options_menu, wxID_ANY, _L("Flush into this object"), "",
         [&select_object_config](wxCommandEvent&) {
-            const ConfigOption* option = select_object_config.option("flush_into_objects");
-            select_object_config.set_key_value("flush_into_objects", new ConfigOptionBool(!option->getBool()));
+            const ConfigOption* option = select_object_config.option(FREQ_SETTINGS_BUNDLE_FFF["Flush options"][1]);
+            select_object_config.set_key_value(FREQ_SETTINGS_BUNDLE_FFF["Flush options"][1], new ConfigOptionBool(!option->getBool()));
             wxGetApp().obj_settings()->UpdateAndShow(true);
-        }, menu, []() {return true; }, [&select_object_config]() {const ConfigOption* option = select_object_config.option("flush_into_objects"); return option->getBool(); }, m_parent);
+        }, menu, []() {return true; }, [&select_object_config]() {const ConfigOption* option = select_object_config.option(FREQ_SETTINGS_BUNDLE_FFF["Flush options"][1]); return option->getBool(); }, m_parent);
 
     append_menu_check_item(flush_options_menu, wxID_ANY, _L("Flush into objects' support"), "",
         [&select_object_config](wxCommandEvent&) {
-            const ConfigOption* option = select_object_config.option("flush_into_support");
-            select_object_config.set_key_value("flush_into_support", new ConfigOptionBool(!option->getBool()));
+            const ConfigOption* option = select_object_config.option(FREQ_SETTINGS_BUNDLE_FFF["Flush options"][2]);
+            select_object_config.set_key_value(FREQ_SETTINGS_BUNDLE_FFF["Flush options"][2], new ConfigOptionBool(!option->getBool()));
             wxGetApp().obj_settings()->UpdateAndShow(true);
-        }, menu, []() {return true; }, [&select_object_config]() {const ConfigOption* option = select_object_config.option("flush_into_support"); return option->getBool(); }, m_parent);
+        }, menu, []() {return true; }, [&select_object_config]() {const ConfigOption* option = select_object_config.option(FREQ_SETTINGS_BUNDLE_FFF["Flush options"][2]); return option->getBool(); }, m_parent);
 
     menu->Append(wxID_ANY, _L("Flush Options"), flush_options_menu);
 }