diff --git a/pype/tools/pyblish_pype/window.py b/pype/tools/pyblish_pype/window.py
index 5b4e806271..b7aada5ff7 100644
--- a/pype/tools/pyblish_pype/window.py
+++ b/pype/tools/pyblish_pype/window.py
@@ -631,12 +631,16 @@ class Window(QtWidgets.QDialog):
         self.comment_box.setEnabled(False)
         self.intent_box.setEnabled(False)
 
+        self._add_intent_to_context()
+
         self.validate()
 
     def on_play_clicked(self):
         self.comment_box.setEnabled(False)
         self.intent_box.setEnabled(False)
 
+        self._add_intent_to_context()
+
         self.publish()
 
     def on_reset_clicked(self):