diff --git a/src/slic3r/GUI/Tab.cpp b/src/slic3r/GUI/Tab.cpp
index 1c03ddf88a..2c1247edb5 100644
--- a/src/slic3r/GUI/Tab.cpp
+++ b/src/slic3r/GUI/Tab.cpp
@@ -3230,16 +3230,17 @@ void TabPrint::toggle_options()
         const auto  current = m_config->opt_enum<BrimType>("brim_type");
         auto       &opt = const_cast<ConfigOptionDef &>(field->m_opt);
         auto        cb  = dynamic_cast<ComboBox *>(choice->window);
-        if (cb != nullptr) {
+        // Keep the entry if it is already selected, so switching to a non-belt
+        // printer cannot leave the control showing a value it does not offer.
+        const bool  offer_leading_edge = is_belt_printer || current == btLeadingEdgeOnly;
+        const bool  offered = std::find(opt.enum_values.begin(), opt.enum_values.end(), "leading_edge_only") != opt.enum_values.end();
+        if (cb != nullptr && offer_leading_edge != offered) {
             auto n = cb->GetValue();
             opt.enum_values.clear();
             opt.enum_labels.clear();
             cb->Clear();
             for (size_t i = 0; i < def->enum_values.size(); ++ i) {
-                // Keep the entry if it is already selected, so switching to a non-belt
-                // printer cannot leave the control showing a value it does not offer.
-                if (def->enum_values[i] == "leading_edge_only" && ! is_belt_printer
-                    && current != btLeadingEdgeOnly)
+                if (def->enum_values[i] == "leading_edge_only" && ! offer_leading_edge)
                     continue;
                 opt.enum_values.push_back(def->enum_values[i]);
                 opt.enum_labels.push_back(def->enum_labels[i]);