diff --git a/lib/Slic3r/GUI/ConfigWizard.pm b/lib/Slic3r/GUI/ConfigWizard.pm
index 5b5708272c..e184566663 100644
--- a/lib/Slic3r/GUI/ConfigWizard.pm
+++ b/lib/Slic3r/GUI/ConfigWizard.pm
@@ -65,7 +65,8 @@ sub run {
             $self->{config}->set('first_layer_temperature', [$self->{config}->temperature->[0] + 5]);
             
             # set first_layer_bed_temperature to temperature + 5
-            $self->{config}->set('first_layer_bed_temperature', $self->{config}->bed_temperature + 5);
+            $self->{config}->set('first_layer_bed_temperature',
+                ($self->{config}->bed_temperature > 0) ? ($self->{config}->bed_temperature + 5) : 0);
         }
         
         $self->Destroy;
@@ -347,7 +348,7 @@ sub new {
     my $self = $class->SUPER::new($parent, 'Bed Temperature');
 
     $self->append_text('Enter the bed temperature needed for getting your filament to stick to your heated bed, then click Next.');
-    $self->append_text('A rule of thumb is 60 °C for PLA and 110 °C for ABS.');
+    $self->append_text('A rule of thumb is 60 °C for PLA and 110 °C for ABS. Leave zero if you have no heated bed.');
     $self->append_option('bed_temperature');
 
     return $self;