diff --git a/client/ayon_core/tools/workfiles/widgets/files_widget.py b/client/ayon_core/tools/workfiles/widgets/files_widget.py
index c5b5047c83..dbe5966c31 100644
--- a/client/ayon_core/tools/workfiles/widgets/files_widget.py
+++ b/client/ayon_core/tools/workfiles/widgets/files_widget.py
@@ -266,9 +266,6 @@ def _on_workarea_save_clicked(self):
     def _on_workarea_path_changed(self, event):
         valid_path = event["path"] is not None
         self._workarea_btn_open.setEnabled(valid_path)
-        valid_task = self._selected_task_id is not None
-        self._workarea_btn_save.setEnabled(valid_task)
-        self._workarea_btn_browse.setEnabled(valid_task)
 
     # -------------------------------------------------------------
     # Published workfiles
@@ -283,8 +280,9 @@ def _update_published_btns_state(self):
         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
@@ -299,6 +297,7 @@ def _on_task_changed(self, event):
             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()