diff --git a/lib/Slic3r/GUI/Controller/ManualControlDialog.pm b/lib/Slic3r/GUI/Controller/ManualControlDialog.pm
index 224c5e069..37dec1634 100644
--- a/lib/Slic3r/GUI/Controller/ManualControlDialog.pm
+++ b/lib/Slic3r/GUI/Controller/ManualControlDialog.pm
@@ -193,18 +193,18 @@ sub new {
         my $sbsizer = Wx::StaticBoxSizer->new($box, wxVERTICAL);
         $right_sizer->Add($sbsizer, 1, wxEXPAND, 0);
     
-        my $log = $self->{log_textctrl} = Wx::TextCtrl->new($box, -1, "", wxDefaultPosition, wxDefaultSize,
+        my $log = $self->{log_textctrl} = Wx::TextCtrl->new($self, -1, "", wxDefaultPosition, wxDefaultSize,
             wxTE_MULTILINE | wxBORDER_NONE);
-        $log->SetBackgroundColour($box->GetBackgroundColour);
+        $log->SetBackgroundColour($self->GetBackgroundColour);
         $log->SetFont($Slic3r::GUI::small_font);
         $log->SetEditable(0);
         $sbsizer->Add($self->{log_textctrl}, 1, wxEXPAND, 0);
         
         my $cmd_sizer = Wx::BoxSizer->new(wxHORIZONTAL);
-        my $cmd_textctrl = Wx::TextCtrl->new($box, -1, '');
+        my $cmd_textctrl = Wx::TextCtrl->new($self, -1, '');
         $cmd_sizer->Add($cmd_textctrl, 1, wxEXPAND, 0);
         
-        my $btn = Wx::Button->new($box, -1,
+        my $btn = Wx::Button->new($self, -1,
             "Send", wxDefaultPosition, wxDefaultSize, wxBU_LEFT | wxBU_EXACTFIT);
         $btn->SetFont($Slic3r::GUI::small_font);
         if ($Slic3r::GUI::have_button_icons) {
@@ -212,7 +212,7 @@ sub new {
         }
         $cmd_sizer->Add($btn, 0, wxEXPAND | wxLEFT, 5);
         
-        EVT_BUTTON($box, $btn, sub {
+        EVT_BUTTON($self, $btn, sub {
             return if $cmd_textctrl->GetValue eq '';
             $self->sender->send($cmd_textctrl->GetValue, 1);
             $cmd_textctrl->SetValue('');
diff --git a/lib/Slic3r/GUI/Controller/PrinterPanel.pm b/lib/Slic3r/GUI/Controller/PrinterPanel.pm
index 3f5fbf9c1..53850a69e 100644
--- a/lib/Slic3r/GUI/Controller/PrinterPanel.pm
+++ b/lib/Slic3r/GUI/Controller/PrinterPanel.pm
@@ -85,7 +85,7 @@ sub new {
     
     # printer name
     {
-        my $text = Wx::StaticText->new($box, -1, $self->printer_name, wxDefaultPosition, [220,-1]);
+        my $text = Wx::StaticText->new($self, -1, $self->printer_name, wxDefaultPosition, [220,-1]);
         my $font = $text->GetFont;
         $font->SetPointSize(20);
         $text->SetFont($font);
@@ -99,19 +99,19 @@ sub new {
         $conn_sizer->AddGrowableCol(1, 1);
         $left_sizer->Add($conn_sizer, 0, wxEXPAND | wxTOP, 5);
         {
-            my $text = Wx::StaticText->new($box, -1, "Port:", wxDefaultPosition, wxDefaultSize);
+            my $text = Wx::StaticText->new($self, -1, "Port:", wxDefaultPosition, wxDefaultSize);
             $text->SetFont($Slic3r::GUI::small_font);
             $conn_sizer->Add($text, 0, wxRIGHT | wxALIGN_CENTER_VERTICAL, 5);
         }
         my $serial_port_sizer = Wx::BoxSizer->new(wxHORIZONTAL);
         {
-            $self->{serial_port_combobox} = Wx::ComboBox->new($box, -1, $config->serial_port, wxDefaultPosition, wxDefaultSize, []);
+            $self->{serial_port_combobox} = Wx::ComboBox->new($self, -1, $config->serial_port, wxDefaultPosition, wxDefaultSize, []);
             $self->{serial_port_combobox}->SetFont($Slic3r::GUI::small_font);
             $self->update_serial_ports;
             $serial_port_sizer->Add($self->{serial_port_combobox}, 0, wxRIGHT | wxALIGN_CENTER_VERTICAL, 1);
         }
         {
-            $self->{btn_rescan_serial} = my $btn = Wx::BitmapButton->new($box, -1, Wx::Bitmap->new($Slic3r::var->("arrow_rotate_clockwise.png"), wxBITMAP_TYPE_PNG),
+            $self->{btn_rescan_serial} = my $btn = Wx::BitmapButton->new($self, -1, Wx::Bitmap->new($Slic3r::var->("arrow_rotate_clockwise.png"), wxBITMAP_TYPE_PNG),
                 wxDefaultPosition, wxDefaultSize, &Wx::wxBORDER_NONE);
             $btn->SetToolTipString("Rescan serial ports")
                 if $btn->can('SetToolTipString');
@@ -121,19 +121,19 @@ sub new {
         $conn_sizer->Add($serial_port_sizer, 0, wxRIGHT | wxALIGN_CENTER_VERTICAL, 5);
         
         {
-            my $text = Wx::StaticText->new($box, -1, "Speed:", wxDefaultPosition, wxDefaultSize);
+            my $text = Wx::StaticText->new($self, -1, "Speed:", wxDefaultPosition, wxDefaultSize);
             $text->SetFont($Slic3r::GUI::small_font);
             $conn_sizer->Add($text, 0, wxRIGHT | wxALIGN_CENTER_VERTICAL, 5);
         }
         my $serial_speed_sizer = Wx::BoxSizer->new(wxHORIZONTAL);
         {
-            $self->{serial_speed_combobox} = Wx::ComboBox->new($box, -1, $config->serial_speed, wxDefaultPosition, wxDefaultSize,
+            $self->{serial_speed_combobox} = Wx::ComboBox->new($self, -1, $config->serial_speed, wxDefaultPosition, wxDefaultSize,
                 ["115200", "250000"]);
             $self->{serial_speed_combobox}->SetFont($Slic3r::GUI::small_font);
             $serial_speed_sizer->Add($self->{serial_speed_combobox}, 0, wxALIGN_CENTER_VERTICAL, 0);
         }
         {
-            $self->{btn_disconnect} = my $btn = Wx::Button->new($box, -1, "Disconnect", wxDefaultPosition, wxDefaultSize);
+            $self->{btn_disconnect} = my $btn = Wx::Button->new($self, -1, "Disconnect", wxDefaultPosition, wxDefaultSize);
             $btn->SetFont($Slic3r::GUI::small_font);
             if ($Slic3r::GUI::have_button_icons) {
                 $btn->SetBitmap(Wx::Bitmap->new($Slic3r::var->("delete.png"), wxBITMAP_TYPE_PNG));
@@ -146,7 +146,7 @@ sub new {
     
     # buttons
     {
-        $self->{btn_connect} = my $btn = Wx::Button->new($box, -1, "Connect to printer", wxDefaultPosition, [-1, 40]);
+        $self->{btn_connect} = my $btn = Wx::Button->new($self, -1, "Connect to printer", wxDefaultPosition, [-1, 40]);
         my $font = $btn->GetFont;
         $font->SetPointSize($font->GetPointSize + 2);
         $btn->SetFont($font);
@@ -165,12 +165,12 @@ sub new {
     }
     
     # status
-    $self->{status_text} = Wx::StaticText->new($box, -1, "", wxDefaultPosition, [200,-1]);
+    $self->{status_text} = Wx::StaticText->new($self, -1, "", wxDefaultPosition, [200,-1]);
     $left_sizer->Add($self->{status_text}, 1, wxEXPAND | wxTOP, 15);
     
     # manual control
     {
-        $self->{btn_manual_control} = my $btn = Wx::Button->new($box, -1, "Manual control", wxDefaultPosition, wxDefaultSize);
+        $self->{btn_manual_control} = my $btn = Wx::Button->new($self, -1, "Manual control", wxDefaultPosition, wxDefaultSize);
         $btn->SetFont($Slic3r::GUI::small_font);
         if ($Slic3r::GUI::have_button_icons) {
             $btn->SetBitmap(Wx::Bitmap->new($Slic3r::var->("cog.png"), wxBITMAP_TYPE_PNG));
@@ -187,7 +187,7 @@ sub new {
     
     # temperature
     {
-        my $temp_panel = $self->{temp_panel} = Wx::Panel->new($box, -1);
+        my $temp_panel = $self->{temp_panel} = Wx::Panel->new($self, -1);
         my $temp_sizer = Wx::BoxSizer->new(wxHORIZONTAL);
         
         my $temp_font = Wx::Font->new($Slic3r::GUI::small_font);
@@ -220,11 +220,11 @@ sub new {
     # print jobs panel
     $self->{print_jobs_sizer} = my $print_jobs_sizer = Wx::BoxSizer->new(wxVERTICAL);
     {
-        my $text = Wx::StaticText->new($box, -1, "Queue:", wxDefaultPosition, wxDefaultSize);
+        my $text = Wx::StaticText->new($self, -1, "Queue:", wxDefaultPosition, wxDefaultSize);
         $text->SetFont($Slic3r::GUI::small_font);
         $print_jobs_sizer->Add($text, 0, wxEXPAND, 0);
         
-        $self->{jobs_panel} = Wx::ScrolledWindow->new($box, -1, wxDefaultPosition, wxDefaultSize,
+        $self->{jobs_panel} = Wx::ScrolledWindow->new($self, -1, wxDefaultPosition, wxDefaultSize,
             wxVSCROLL | wxBORDER_NONE);
         $self->{jobs_panel}->SetScrollbars(0, 1, 0, 1);
         $self->{jobs_panel_sizer} = Wx::BoxSizer->new(wxVERTICAL);
@@ -248,13 +248,13 @@ sub new {
     
     my $log_sizer = Wx::BoxSizer->new(wxVERTICAL);
     {
-        my $text = Wx::StaticText->new($box, -1, "Log:", wxDefaultPosition, wxDefaultSize);
+        my $text = Wx::StaticText->new($self, -1, "Log:", wxDefaultPosition, wxDefaultSize);
         $text->SetFont($Slic3r::GUI::small_font);
         $log_sizer->Add($text, 0, wxEXPAND, 0);
         
-        my $log = $self->{log_textctrl} = Wx::TextCtrl->new($box, -1, "", wxDefaultPosition, wxDefaultSize,
+        my $log = $self->{log_textctrl} = Wx::TextCtrl->new($self, -1, "", wxDefaultPosition, wxDefaultSize,
             wxTE_MULTILINE | wxBORDER_NONE);
-        $log->SetBackgroundColour($box->GetBackgroundColour);
+        $log->SetBackgroundColour($self->GetBackgroundColour);
         $log->SetFont($Slic3r::GUI::small_font);
         $log->SetEditable(0);
         $log_sizer->Add($self->{log_textctrl}, 1, wxEXPAND, 0);