diff --git a/resources/ui/carla_host.ui b/resources/ui/carla_host.ui
index 505411b0d..e198d0038 100644
--- a/resources/ui/carla_host.ui
+++ b/resources/ui/carla_host.ui
@@ -801,18 +801,18 @@
   </action>
  </widget>
  <customwidgets>
-  <customwidget>
-   <class>CanvasPreviewFrame</class>
-   <extends>QFrame</extends>
-   <header>canvaspreviewframe.h</header>
-   <container>1</container>
-  </customwidget>
   <customwidget>
    <class>DigitalPeakMeter</class>
    <extends>QWidget</extends>
    <header>digitalpeakmeter.h</header>
    <container>1</container>
   </customwidget>
+  <customwidget>
+   <class>CanvasPreviewFrame</class>
+   <extends>QFrame</extends>
+   <header>canvaspreviewframe.h</header>
+   <container>1</container>
+  </customwidget>
   <customwidget>
    <class>RackListWidget</class>
    <extends>QListWidget</extends>
@@ -839,21 +839,5 @@
     </hint>
    </hints>
   </connection>
-  <connection>
-   <sender>act_settings_show_toolbar</sender>
-   <signal>triggered(bool)</signal>
-   <receiver>toolBar</receiver>
-   <slot>setVisible(bool)</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>-1</x>
-     <y>-1</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>354</x>
-     <y>35</y>
-    </hint>
-   </hints>
-  </connection>
  </connections>
 </ui>
diff --git a/source/carla_host.py b/source/carla_host.py
index b2ec09432..4bc149851 100644
--- a/source/carla_host.py
+++ b/source/carla_host.py
@@ -345,6 +345,7 @@ class HostWindow(QMainWindow):
         self.ui.act_canvas_arrange.setEnabled(False) # TODO, later
 
         self.ui.act_settings_show_time_panel.toggled.connect(self.slot_showTimePanel)
+        self.ui.act_settings_show_toolbar.toggled.connect(self.slot_showToolbar)
         self.ui.act_settings_show_meters.toggled.connect(self.slot_showCanvasMeters)
         self.ui.act_settings_show_keyboard.toggled.connect(self.slot_showCanvasKeyboard)
         self.ui.act_settings_configure.triggered.connect(self.slot_configureCarla)
@@ -1246,7 +1247,7 @@ class HostWindow(QMainWindow):
         if not self.host.isPlugin:
             settings.setValue("ShowTimePanel", self.ui.panelTime.isVisible())
 
-        settings.setValue("ShowToolbar",   self.ui.toolBar.isVisible())
+        settings.setValue("ShowToolbar", self.ui.toolBar.isEnabled())
 
         diskFolders = []
 
@@ -1279,6 +1280,7 @@ class HostWindow(QMainWindow):
 
             showToolbar = settings.value("ShowToolbar", True, type=bool)
             self.ui.act_settings_show_toolbar.setChecked(showToolbar)
+            self.ui.toolBar.setEnabled(showToolbar)
             self.ui.toolBar.setVisible(showToolbar)
 
             #if settings.contains("SplitterState"):
@@ -1349,6 +1351,11 @@ class HostWindow(QMainWindow):
     def slot_showTimePanel(self, yesNo):
         self.ui.panelTime.setVisible(yesNo)
 
+    @pyqtSlot(bool)
+    def slot_showToolbar(self, yesNo):
+        self.ui.toolBar.setEnabled(yesNo)
+        self.ui.toolBar.setVisible(yesNo)
+
     @pyqtSlot(bool)
     def slot_showCanvasMeters(self, yesNo):
         self.ui.peak_in.setVisible(yesNo)