diff --git a/client/ayon_core/hooks/pre_add_last_workfile_arg.py b/client/ayon_core/hooks/pre_add_last_workfile_arg.py
index d5914c2352..daea8c5502 100644
--- a/client/ayon_core/hooks/pre_add_last_workfile_arg.py
+++ b/client/ayon_core/hooks/pre_add_last_workfile_arg.py
@@ -26,6 +26,7 @@ class AddLastWorkfileToLaunchArgs(PreLaunchHook):
         "photoshop",
         "tvpaint",
         "substancepainter",
+        "substancedesigner",
         "aftereffects",
         "wrap",
         "openrv",
diff --git a/client/ayon_core/hooks/pre_ocio_hook.py b/client/ayon_core/hooks/pre_ocio_hook.py
index 7406aa42cf..78fc8c78de 100644
--- a/client/ayon_core/hooks/pre_ocio_hook.py
+++ b/client/ayon_core/hooks/pre_ocio_hook.py
@@ -10,6 +10,7 @@ class OCIOEnvHook(PreLaunchHook):
     order = 0
     hosts = {
         "substancepainter",
+        "substancedesigner",
         "fusion",
         "blender",
         "aftereffects",
diff --git a/client/ayon_core/plugins/publish/collect_resources_path.py b/client/ayon_core/plugins/publish/collect_resources_path.py
index 7a80d0054c..2e5b296228 100644
--- a/client/ayon_core/plugins/publish/collect_resources_path.py
+++ b/client/ayon_core/plugins/publish/collect_resources_path.py
@@ -66,7 +66,8 @@ class CollectResourcesPath(pyblish.api.InstancePlugin):
                 "yeticacheUE",
                 "tycache",
                 "usd",
-                "oxrig"
+                "oxrig",
+                "sbsar",
                 ]
 
     def process(self, instance):
diff --git a/client/ayon_core/tools/workfiles/widgets/files_widget.py b/client/ayon_core/tools/workfiles/widgets/files_widget.py
index 16f0b6fce3..dbe5966c31 100644
--- a/client/ayon_core/tools/workfiles/widgets/files_widget.py
+++ b/client/ayon_core/tools/workfiles/widgets/files_widget.py
@@ -136,6 +136,8 @@ class FilesWidget(QtWidgets.QWidget):
 
         # Initial setup
         workarea_btn_open.setEnabled(False)
+        workarea_btn_browse.setEnabled(False)
+        workarea_btn_save.setEnabled(False)
         published_btn_copy_n_open.setEnabled(False)
         published_btn_change_context.setEnabled(False)
         published_btn_cancel.setVisible(False)
@@ -278,8 +280,9 @@ class FilesWidget(QtWidgets.QWidget):
         self._published_btn_change_context.setEnabled(enabled)
 
     def _update_workarea_btns_state(self):
-        enabled = self._is_save_enabled
+        enabled = self._is_save_enabled and self._valid_selected_context
         self._workarea_btn_save.setEnabled(enabled)
+        self._workarea_btn_browse.setEnabled(self._valid_selected_context)
 
     def _on_published_repre_changed(self, event):
         self._valid_representation_id = event["representation_id"] is not None
@@ -294,6 +297,7 @@ class FilesWidget(QtWidgets.QWidget):
             and self._selected_task_id is not None
         )
         self._update_published_btns_state()
+        self._update_workarea_btns_state()
 
     def _on_published_save_clicked(self):
         result = self._exec_save_as_dialog()