diff --git a/lib/Slic3r/GUI/3DScene.pm b/lib/Slic3r/GUI/3DScene.pm
index 8835ff94b..d59e8da5e 100644
--- a/lib/Slic3r/GUI/3DScene.pm
+++ b/lib/Slic3r/GUI/3DScene.pm
@@ -1112,6 +1112,7 @@ sub draw_volumes {
             $min_offset //= 0;
             $max_offset //= $volume->qverts->size;
             
+            glColor4f(@baseColor);
             glVertexPointer_c(3, GL_FLOAT, 0, $volume->qverts->verts_ptr);
             glNormalPointer_c(GL_FLOAT, 0, $volume->qverts->norms_ptr);
             glDrawArrays(GL_QUADS, $min_offset / 3, ($max_offset-$min_offset) / 3);
diff --git a/lib/Slic3r/GUI/Plater/ObjectRotateFaceDialog.pm b/lib/Slic3r/GUI/Plater/ObjectRotateFaceDialog.pm
index e39ab5978..b1b84e7be 100644
--- a/lib/Slic3r/GUI/Plater/ObjectRotateFaceDialog.pm
+++ b/lib/Slic3r/GUI/Plater/ObjectRotateFaceDialog.pm
@@ -54,6 +54,7 @@ sub new {
         
         $self->{btn_rot} = Wx::Button->new($self, -1, "Rotate to Plane", wxDefaultPosition, wxDefaultSize);
         $self->{btn_rot}->SetDefault;
+        $self->{btn_rot}->Disable;
         $button_sizer->Add($self->{btn_rot}, 0, wxALIGN_RIGHT | wxALL, 10);
         $optgroup->append_line(Slic3r::GUI::OptionsGroup::Line->new(
             sizer => $button_sizer,
@@ -77,7 +78,9 @@ sub new {
         $canvas->zoom_to_volumes;
         $canvas->on_select(sub {
             my ($volume_idx) = @_;
+            $self->{btn_rot}->Disable;
             $self->{normal} = $canvas->calculate_normal($volume_idx);
+            $self->{btn_rot}->Enable if defined $self->{normal};
         });
     }
     
diff --git a/var/rotate_face.png b/var/rotate_face.png
index ec7652ae2..8268ee912 100644
Binary files a/var/rotate_face.png and b/var/rotate_face.png differ