diff --git a/.gitignore b/.gitignore
index 867b49420f..4b186b4e14 100644
--- a/.gitignore
+++ b/.gitignore
@@ -44,3 +44,4 @@ test.js
 /.cache/
 .clangd
 internal_docs/
+*.flatpak
\ No newline at end of file
diff --git a/src/slic3r/GUI/Gizmos/GLGizmoMeasure.cpp b/src/slic3r/GUI/Gizmos/GLGizmoMeasure.cpp
index eeeb3da285..8a6bed9bca 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmoMeasure.cpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmoMeasure.cpp
@@ -678,7 +678,7 @@ void GLGizmoMeasure::on_render()
                                                                                m_mesh_raycaster_map[m_last_hit_volume]->get_transform(), m_only_select_plane) :
                                                               std::nullopt;
             }
-            if (m_measure_mode == EMeasureMode::ONLY_ASSEMBLY) {
+            if (m_measure_mode == EMeasureMode::ONLY_ASSEMBLY && curr_feature.has_value()) {
                 if (m_assembly_mode == AssemblyMode::FACE_FACE) {
                     if (curr_feature->get_type() != Measure::SurfaceFeatureType::Plane) {
                         curr_feature.reset();