diff --git a/src/libslic3r/PrintConfig.cpp b/src/libslic3r/PrintConfig.cpp
index 64c29f2d90..c6a324b533 100644
--- a/src/libslic3r/PrintConfig.cpp
+++ b/src/libslic3r/PrintConfig.cpp
@@ -4685,7 +4685,7 @@ bool is_XL_printer(const DynamicPrintConfig &cfg)
     auto *printer_model = cfg.opt<ConfigOptionString>("printer_model");
 
     if (printer_model)
-        ret = boost::algorithm::contains(printer_model->value, ALIGN_ONLY_FOR);
+        ret = boost::algorithm::starts_with(printer_model->value, ALIGN_ONLY_FOR);
 
     return ret;
 }
diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp
index bb95524811..73fb52fa01 100644
--- a/src/slic3r/GUI/Plater.cpp
+++ b/src/slic3r/GUI/Plater.cpp
@@ -6983,7 +6983,7 @@ PlaterAfterLoadAutoArrange::PlaterAfterLoadAutoArrange()
     Plater* plater = wxGetApp().plater();
     m_enabled = plater->model().objects.empty() &&
                 plater->printer_technology() == ptFFF &&
-                plater->fff_print().config().printer_model.value == "XL";
+                is_XL_printer(*plater->config());
 }
 
 PlaterAfterLoadAutoArrange::~PlaterAfterLoadAutoArrange()