diff --git a/lib/Slic3r/GUI/3DScene.pm b/lib/Slic3r/GUI/3DScene.pm
index 7a8aa94a72..b95e8777fa 100644
--- a/lib/Slic3r/GUI/3DScene.pm
+++ b/lib/Slic3r/GUI/3DScene.pm
@@ -33,6 +33,7 @@ use Slic3r::Geometry qw(PI);
 __PACKAGE__->mk_accessors( qw(_quat _dirty init
                               enable_picking
                               enable_moving
+                              use_plain_shader
                               on_viewport_changed
                               on_hover
                               on_select
@@ -132,6 +133,7 @@ sub new {
     $self->_stheta(45);
     $self->_sphi(45);
     $self->_zoom(1);
+    $self->use_plain_shader(0);
 
     # Collection of GLVolume objects
     $self->volumes(Slic3r::GUI::_3DScene::GLVolume::Collection->new);
@@ -1206,7 +1208,7 @@ sub Render {
     glEnable(GL_LIGHTING);
     
     # draw objects
-    if ($self->enable_picking) {
+    if (! $self->use_plain_shader) {
         $self->draw_volumes;
     } elsif ($self->UseVBOs) {
         $self->{plain_shader}->enable if $self->{plain_shader};
diff --git a/lib/Slic3r/GUI/Plater/3DPreview.pm b/lib/Slic3r/GUI/Plater/3DPreview.pm
index e3ad8570c9..fef8bc1975 100644
--- a/lib/Slic3r/GUI/Plater/3DPreview.pm
+++ b/lib/Slic3r/GUI/Plater/3DPreview.pm
@@ -18,6 +18,7 @@ sub new {
     
     # init GUI elements
     my $canvas = Slic3r::GUI::3DScene->new($self);
+    $canvas->use_plain_shader(1);
     $self->canvas($canvas);
     my $slider_low = Wx::Slider->new(
         $self, -1,