diff --git a/src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp b/src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp
index 2c9c4539e7c..8b8c0e28ed5 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp
@@ -7348,6 +7348,13 @@ bool GLGizmoImageProjection::ensure_overlay_texture()
         m_image_error = _u8L("Unable to display the selected image.");
         return false;
     }
+    glsafe(::glBindTexture(GL_TEXTURE_2D, m_overlay_texture.get_id()));
+    glsafe(::glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE));
+    glsafe(::glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE));
+    glsafe(::glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR));
+    glsafe(::glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR));
+    glsafe(::glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, 0));
+    glsafe(::glBindTexture(GL_TEXTURE_2D, 0));
     m_overlay_texture_dirty = false;
     return true;
 }
diff --git a/src/slic3r/GUI/Gizmos/GLGizmoPainterBase.cpp b/src/slic3r/GUI/Gizmos/GLGizmoPainterBase.cpp
index de79f8240be..d56a9c7866b 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmoPainterBase.cpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmoPainterBase.cpp
@@ -1696,26 +1696,28 @@ void TriangleSelectorPatch::update_render_data()
                                                       m_vertex_color_preview_colors,
                                                       m_vertex_color_preview_filament_ids,
                                                       m_texture_mapping_color_preview);
-            } else if (model_volume_has_texture_preview_data_for_painting(*m_model_volume)) {
-                build_mmu_texture_preview_models(*m_model_volume,
-                                                 triangles_per_type,
-                                                 m_ebt_colors,
-                                                 m_model_volume->extruder_id() > 0 ? unsigned(m_model_volume->extruder_id()) : 0u,
-                                                 num_physical,
-                                                 texture_mgr,
-                                                 m_texture_preview_models,
-                                                 m_texture_preview_colors,
-                                                 m_texture_preview_filament_ids);
+            } else {
+                if (model_volume_has_texture_preview_data_for_painting(*m_model_volume)) {
+                    build_mmu_texture_preview_models(*m_model_volume,
+                                                     triangles_per_type,
+                                                     m_ebt_colors,
+                                                     m_model_volume->extruder_id() > 0 ? unsigned(m_model_volume->extruder_id()) : 0u,
+                                                     num_physical,
+                                                     texture_mgr,
+                                                     m_texture_preview_models,
+                                                     m_texture_preview_colors,
+                                                     m_texture_preview_filament_ids);
+                }
+                build_mmu_vertex_color_preview_models(*m_model_volume,
+                                                      triangles_per_type,
+                                                      m_ebt_colors,
+                                                      m_model_volume->extruder_id() > 0 ? unsigned(m_model_volume->extruder_id()) : 0u,
+                                                      num_physical,
+                                                      texture_mgr,
+                                                      m_vertex_color_preview_models,
+                                                      m_vertex_color_preview_colors,
+                                                      m_vertex_color_preview_filament_ids);
             }
-            build_mmu_vertex_color_preview_models(*m_model_volume,
-                                                  triangles_per_type,
-                                                  m_ebt_colors,
-                                                  m_model_volume->extruder_id() > 0 ? unsigned(m_model_volume->extruder_id()) : 0u,
-                                                  num_physical,
-                                                  texture_mgr,
-                                                  m_vertex_color_preview_models,
-                                                  m_vertex_color_preview_colors,
-                                                  m_vertex_color_preview_filament_ids);
         }
 
         m_paint_changed = false;