diff --git a/lib/Slic3r/GUI/Plater.pm b/lib/Slic3r/GUI/Plater.pm
index 00579ba87..be1e02021 100644
--- a/lib/Slic3r/GUI/Plater.pm
+++ b/lib/Slic3r/GUI/Plater.pm
@@ -2013,6 +2013,8 @@ sub selection_changed {
                 } else {
                     $self->{object_info_manifold}->SetLabel(L("Yes"));
                     $self->{object_info_manifold_warning_icon}->Hide;
+                    $self->{object_info_manifold}->SetToolTipString("");
+                    $self->{object_info_manifold_warning_icon}->SetToolTipString("");
                 }
             } else {
                 $self->{object_info_facets}->SetLabel($object->facets);
@@ -2021,6 +2023,7 @@ sub selection_changed {
             $self->{"object_info_$_"}->SetLabel("") for qw(size volume facets materials manifold);
             $self->{object_info_manifold_warning_icon}->Hide;
             $self->{object_info_manifold}->SetToolTipString("");
+            $self->{object_info_manifold_warning_icon}->SetToolTipString("");
         }
         $self->Layout;
     }
diff --git a/xs/src/slic3r/GUI/3DScene.cpp b/xs/src/slic3r/GUI/3DScene.cpp
index df8b1fbfc..6569f480f 100644
--- a/xs/src/slic3r/GUI/3DScene.cpp
+++ b/xs/src/slic3r/GUI/3DScene.cpp
@@ -1762,12 +1762,13 @@ void _3DScene::load_gcode_preview(const Print* print, const GCodePreviewData* pr
         else
         {
             _generate_legend_texture(*preview_data, tool_colors);
-            _load_shells(*print, *volumes, use_VBOs);
 
             // removes empty volumes
             volumes->volumes.erase(std::remove_if(volumes->volumes.begin(), volumes->volumes.end(),
                 [](const GLVolume *volume) { return volume->print_zs.empty(); }),
                 volumes->volumes.end());
+
+            _load_shells(*print, *volumes, use_VBOs);
         }
     }