diff --git a/source/carla_host.py b/source/carla_host.py
index 1117bc2fc..af8ef7679 100644
--- a/source/carla_host.py
+++ b/source/carla_host.py
@@ -206,7 +206,10 @@ class HostWindow(QMainWindow):
 
         self.fSavedSettings = {}
 
-        if LADISH_APP_NAME:
+        if gCarla.isPlugin:
+            self.fClientName         = "Carla-Plugin"
+            self.fSessionManagerName = "Plugin"
+        elif LADISH_APP_NAME:
             self.fClientName         = LADISH_APP_NAME
             self.fSessionManagerName = "LADISH"
         elif NSM_URL:
@@ -225,13 +228,15 @@ class HostWindow(QMainWindow):
         # Set up GUI (engine stopped)
 
         if gCarla.isPlugin:
-            self.ui.act_file_new.setEnabled(False)
-            self.ui.act_file_open.setEnabled(False)
             self.ui.act_engine_start.setEnabled(False)
             self.ui.menu_Engine.setEnabled(False)
         else:
             self.ui.act_engine_start.setEnabled(True)
 
+        if self.fSessionManagerName:
+            self.ui.act_file_new.setEnabled(False)
+
+        self.ui.act_file_open.setEnabled(False)
         self.ui.act_file_save.setEnabled(False)
         self.ui.act_file_save_as.setEnabled(False)
         self.ui.act_engine_stop.setEnabled(False)
@@ -847,12 +852,12 @@ class HostWindow(QMainWindow):
         self.ui.menu_Canvas.setEnabled(check)
 
         if not gCarla.isPlugin:
-            self.ui.act_file_save.setEnabled(check)
             self.ui.act_engine_start.setEnabled(not check)
             self.ui.act_engine_stop.setEnabled(check)
 
-            if self.fSessionManagerName != "Non Session Manager":
+            if not self.fSessionManagerName:
                 self.ui.act_file_open.setEnabled(check)
+                self.ui.act_file_save.setEnabled(check)
                 self.ui.act_file_save_as.setEnabled(check)
 
             self.setTransportMenuEnabled(check)
@@ -877,12 +882,12 @@ class HostWindow(QMainWindow):
         self.ui.menu_Canvas.setEnabled(check)
 
         if not gCarla.isPlugin:
-            self.ui.act_file_save.setEnabled(check)
             self.ui.act_engine_start.setEnabled(not check)
             self.ui.act_engine_stop.setEnabled(check)
 
-            if self.fSessionManagerName != "Non Session Manager":
+            if not self.fSessionManagerName:
                 self.ui.act_file_open.setEnabled(check)
+                self.ui.act_file_save.setEnabled(check)
                 self.ui.act_file_save_as.setEnabled(check)
 
             self.setTransportMenuEnabled(check)
diff --git a/source/carla_settings.py b/source/carla_settings.py
index b669f0dbc..5c52e9dba 100755
--- a/source/carla_settings.py
+++ b/source/carla_settings.py
@@ -278,9 +278,12 @@ class CarlaSettingsW(QDialog):
                 self.ui.cb_canvas_use_opengl.setChecked(False)
                 self.ui.cb_canvas_use_opengl.setEnabled(False)
 
-        if not hasEngine:
+        if gCarla.isPlugin or not hasEngine:
             self.ui.lw_page.hideRow(self.TAB_INDEX_ENGINE)
 
+            if gCarla.isPlugin:
+                self.ui.lw_page.hideRow(self.TAB_INDEX_PATHS)
+
         if WINDOWS:
             self.ui.group_main_theme.setEnabled(False)
             self.ui.ch_main_theme_pro.setChecked(False)
@@ -288,10 +291,6 @@ class CarlaSettingsW(QDialog):
         if not MACOS:
             self.ui.cb_paths.removeItem(self.ui.cb_paths.findText("AU"))
 
-        if gCarla.isPlugin:
-            self.ui.lw_page.hideRow(self.TAB_INDEX_ENGINE)
-            self.ui.lw_page.hideRow(self.TAB_INDEX_PATHS)
-
         # -------------------------------------------------------------
         # Set-up connections
 
diff --git a/source/carla_shared.py b/source/carla_shared.py
index 24608f8a1..3e5e86b43 100644
--- a/source/carla_shared.py
+++ b/source/carla_shared.py
@@ -580,7 +580,8 @@ def initHost(initName, libPrefix = None, failError = True):
     if gCarla.host is None:
         gCarla.host = Host(libfilename)
 
-    gCarla.host.set_engine_option(ENGINE_OPTION_NSM_INIT, os.getpid(), initName)
+    if not (gCarla.isControl or gCarla.isPlugin):
+        gCarla.host.set_engine_option(ENGINE_OPTION_NSM_INIT, os.getpid(), initName)
 
     # -------------------------------------------------------------
     # Set binary path