diff --git a/src/libslic3r/GCode/GCodeProcessor.cpp b/src/libslic3r/GCode/GCodeProcessor.cpp
index 8de1815ae..ec57313f4 100644
--- a/src/libslic3r/GCode/GCodeProcessor.cpp
+++ b/src/libslic3r/GCode/GCodeProcessor.cpp
@@ -5,6 +5,7 @@
 #include "libslic3r/format.hpp"
 #include "GCodeProcessor.hpp"
 
+#include <boost/algorithm/string/case_conv.hpp>
 #include <boost/log/trivial.hpp>
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/algorithm/string/split.hpp>
diff --git a/src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp b/src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp
index 513a655ec..b30c29db1 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp
@@ -503,9 +503,6 @@ void GLGizmoFdmSupports::auto_generate()
         return vol->type() != ModelVolumeType::MODEL_PART || vol->supported_facets.empty();
     });
 
-    mo->config.set("support_material", true);
-    mo->config.set("support_material_auto", false);
-
     MessageDialog dlg(GUI::wxGetApp().plater(),
                         _L("Autogeneration will erase all currently painted areas.") + "\n\n" +
                         _L("Are you sure you want to do it?") + "\n",
@@ -523,6 +520,8 @@ void GLGizmoFdmSupports::auto_generate()
             }
         }
 
+        mo->config.set("support_material", true);
+        mo->config.set("support_material_auto", false);
         this->waiting_for_autogenerated_supports = true;
         wxGetApp().CallAfter([this]() { reslice_FDM_supports(); });
     }