diff --git a/lib/Slic3r/GUI/3DScene.pm b/lib/Slic3r/GUI/3DScene.pm
index 3bfb6f7597..33c0e8d37b 100644
--- a/lib/Slic3r/GUI/3DScene.pm
+++ b/lib/Slic3r/GUI/3DScene.pm
@@ -2192,10 +2192,8 @@ sub reset_legend_texture {
 }
 
 sub get_current_print_zs {
-    my ($self) = @_;
-    
-    my $count = $self->volumes->get_current_print_zs();
-    return $count;
+    my ($self, $active_only) = @_;
+    return $self->volumes->get_current_print_zs($active_only);
 }
 
 1;
diff --git a/lib/Slic3r/GUI/Plater/3DPreview.pm b/lib/Slic3r/GUI/Plater/3DPreview.pm
index fec463682b..de6c6e8180 100644
--- a/lib/Slic3r/GUI/Plater/3DPreview.pm
+++ b/lib/Slic3r/GUI/Plater/3DPreview.pm
@@ -380,7 +380,7 @@ sub load_print {
             $self->show_hide_ui_elements('full');
 
             # recalculates zs and update sliders accordingly
-            $self->{layers_z} = $self->canvas->get_current_print_zs();
+            $self->{layers_z} = $self->canvas->get_current_print_zs(1);
             $n_layers = scalar(@{$self->{layers_z}});            
             if ($n_layers == 0) {
                 # all layers filtered out
@@ -465,10 +465,21 @@ sub set_z_range
     $self->{z_high} = $z_high;
     $self->{z_label_low}->SetLabel(sprintf '%.2f', $z_low);
     $self->{z_label_high}->SetLabel(sprintf '%.2f', $z_high);
-    my $z_idx_low = 1 + $self->slider_low->GetValue;
-    my $z_idx_high = 1 + $self->slider_high->GetValue;
-    $self->{z_label_low_idx}->SetLabel(sprintf '%d', $z_idx_low);
-    $self->{z_label_high_idx}->SetLabel(sprintf '%d', $z_idx_high);
+    
+    my $layers_z = $self->canvas->get_current_print_zs(0);
+    for (my $i = 0; $i < scalar(@{$layers_z}); $i += 1) {
+        if (($z_low - 1e-6 < @{$layers_z}[$i]) && (@{$layers_z}[$i] < $z_low + 1e-6)) {
+            $self->{z_label_low_idx}->SetLabel(sprintf '%d', $i + 1);
+            last;
+        }
+    }
+    for (my $i = 0; $i < scalar(@{$layers_z}); $i += 1) {
+        if (($z_high - 1e-6 < @{$layers_z}[$i]) && (@{$layers_z}[$i] < $z_high + 1e-6)) {
+            $self->{z_label_high_idx}->SetLabel(sprintf '%d', $i + 1);
+            last;
+        }
+    }
+
     $self->canvas->set_toolpaths_range($z_low - 1e-6, $z_high + 1e-6);
     $self->canvas->Refresh if $self->IsShown;
 }
diff --git a/xs/src/slic3r/GUI/3DScene.cpp b/xs/src/slic3r/GUI/3DScene.cpp
index 0ead76b885..db1737e149 100644
--- a/xs/src/slic3r/GUI/3DScene.cpp
+++ b/xs/src/slic3r/GUI/3DScene.cpp
@@ -760,13 +760,13 @@ void GLVolumeCollection::update_colors_by_extruder(const DynamicPrintConfig* con
     }
 }
 
-std::vector<double> GLVolumeCollection::get_current_print_zs() const
+std::vector<double> GLVolumeCollection::get_current_print_zs(bool active_only) const
 {
     // Collect layer top positions of all volumes.
     std::vector<double> print_zs;
     for (GLVolume *vol : this->volumes)
     {
-        if (vol->is_active)
+        if (!active_only || vol->is_active)
             append(print_zs, vol->print_zs);
     }
     std::sort(print_zs.begin(), print_zs.end());
diff --git a/xs/src/slic3r/GUI/3DScene.hpp b/xs/src/slic3r/GUI/3DScene.hpp
index fb5d9f14b2..a417f5f9df 100644
--- a/xs/src/slic3r/GUI/3DScene.hpp
+++ b/xs/src/slic3r/GUI/3DScene.hpp
@@ -428,7 +428,7 @@ public:
     void update_colors_by_extruder(const DynamicPrintConfig* config);
 
     // Returns a vector containing the sorted list of all the print_zs of the volumes contained in this collection
-    std::vector<double> get_current_print_zs() const;
+    std::vector<double> get_current_print_zs(bool active_only) const;
 
 private:
     GLVolumeCollection(const GLVolumeCollection &other);
diff --git a/xs/xsp/GUI_3DScene.xsp b/xs/xsp/GUI_3DScene.xsp
index ee5a82ba1f..6a907291e2 100644
--- a/xs/xsp/GUI_3DScene.xsp
+++ b/xs/xsp/GUI_3DScene.xsp
@@ -92,10 +92,9 @@
     int count()
         %code{% RETVAL = THIS->volumes.size(); %};
         
-    std::vector<double> get_current_print_zs()
-        %code{% RETVAL = THIS->get_current_print_zs(); %};
+    std::vector<double> get_current_print_zs(bool active_only)
+        %code{% RETVAL = THIS->get_current_print_zs(active_only); %};
 
-        
     void set_range(double low, double high);
 
     void render_VBOs() const;