diff --git a/src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp b/src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp
index e8aa86612..264903f94 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp
@@ -496,6 +496,10 @@ void GLGizmoRotate3D::on_set_state()
 void GLGizmoRotate3D::data_changed(bool is_serializing) {
     const Selection &selection = m_parent.get_selection();
     const GLVolume * volume    = selection.get_first_volume();
+    if (volume == nullptr) {
+        m_last_volume = nullptr;
+        return;
+    }
     if (m_last_volume != volume) {
         m_last_volume = volume;
         Geometry::Transformation tran;
diff --git a/src/slic3r/GUI/Gizmos/GLGizmoSVG.cpp b/src/slic3r/GUI/Gizmos/GLGizmoSVG.cpp
index d64870bd9..e12e4e562 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmoSVG.cpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmoSVG.cpp
@@ -1500,7 +1500,7 @@ void GLGizmoSVG::draw_filename()
         draw(get_icon(m_icons, IconType::bake, IconState::hovered));
         ImGui::SameLine();
         // TRN: An menu option to convert the SVG into an unmodifiable model part.
-        if (ImGui::Selectable(_L("Bake to model").c_str())) {
+        if (ImGui::Selectable(_u8L("Bake to model").c_str())) {
             m_volume->emboss_shape.reset();
             close();
         } else if (ImGui::IsItemHovered()) {