diff --git a/hyperion/manager.py b/hyperion/manager.py
index 72edd0d..96b760c 100644
--- a/hyperion/manager.py
+++ b/hyperion/manager.py
@@ -750,7 +750,9 @@ def check_component(self, comp: Component, broadcast: bool = True) -> config.Che
             State of the component
         """
 
-        if self.mon_thread.is_component_monitored(comp['id']):
+        if self.mon_thread.is_component_monitored(comp["id"]):
+            if broadcast:
+                self.broadcast_event(events.CheckEvent(comp["id"], config.CheckState.RUNNING))
             return config.CheckState.RUNNING
 
         try:
@@ -1377,6 +1379,13 @@ def __init__(
                 "to create a new one"
             )
 
+            if self.session:
+                window = self._find_window('Main')
+                if not window:
+                    self.logger.debug("Session has no 'Main' window, Maybe session is in use somewhere.")
+                    self.session.new_window('Main')
+                session_ready = True    
+
         if not session_ready:
             self.logger.info(
                 f'starting new session by name "{self.session_name}" on server'