diff --git a/lib/Slic3r/GUI/MainFrame.pm b/lib/Slic3r/GUI/MainFrame.pm
index c4ceb7780..1b07d37ef 100644
--- a/lib/Slic3r/GUI/MainFrame.pm
+++ b/lib/Slic3r/GUI/MainFrame.pm
@@ -99,9 +99,8 @@ sub _init_tabpanel {
     });
     
     $panel->AddPage($self->{plater} = Slic3r::GUI::Plater->new($panel), "Plater");
-    if (!$self->{no_controller}) {
-        $panel->AddPage($self->{controller} = Slic3r::GUI::Controller->new($panel), "Controller");
-    }
+    $panel->AddPage($self->{controller} = Slic3r::GUI::Controller->new($panel), "Controller")
+        unless ($Slic3r::GUI::Settings->{_}{no_controller});
 }
 
 sub _init_menubar {
@@ -259,7 +258,7 @@ sub _init_menubar {
         }, undef, 'application_view_tile.png');
         $self->_append_menu_item($windowMenu, "&Controller\tCtrl+Y", 'Show the printer controller', sub {
             $self->select_tab(1);
-        }, undef, 'printer_empty.png') if !$self->{no_controller};
+        }, undef, 'printer_empty.png') unless ($Slic3r::GUI::Settings->{_}{no_controller});
         $self->_append_menu_item($windowMenu, "DLP Projector…\tCtrl+P", 'Open projector window for DLP printing', sub {
             $self->{plater}->pause_background_process;
             Slic3r::GUI::SLAPrintOptions->new($self)->ShowModal;