diff --git a/source/frontend/carla_host.py b/source/frontend/carla_host.py
index e0aaddd8c..d75320654 100644
--- a/source/frontend/carla_host.py
+++ b/source/frontend/carla_host.py
@@ -278,9 +278,6 @@ class HostWindow(QMainWindow):
             if WINDOWS:
                 self.ui.tabWidget.tabBar().hide()
 
-            if host.isControl:
-                self.ui.dockWidget.hide()
-
         # ----------------------------------------------------------------------------------------------------
         # Set up GUI (disk)
 
@@ -1594,7 +1591,9 @@ class HostWindow(QMainWindow):
 
         settings.setValue("Geometry", self.saveGeometry())
         settings.setValue("ShowToolbar", self.ui.toolBar.isEnabled())
-        settings.setValue("ShowSidePanel", self.ui.dockWidget.isEnabled())
+
+        if not self.host.isControl:
+            settings.setValue("ShowSidePanel", self.ui.dockWidget.isEnabled())
 
         diskFolders = []
 
@@ -1628,7 +1627,7 @@ class HostWindow(QMainWindow):
             #else:
                 #self.ui.splitter.setSizes([210, 99999])
 
-            showSidePanel = settings.value("ShowSidePanel", True, type=bool)
+            showSidePanel = settings.value("ShowSidePanel", True, type=bool) and not self.host.isControl
             self.ui.act_settings_show_side_panel.setChecked(showSidePanel)
             self.slot_showSidePanel(showSidePanel)