diff --git a/packages/trace-viewer/src/ui/uiModeView.tsx b/packages/trace-viewer/src/ui/uiModeView.tsx
index 9201da88c9..25eda6cfbd 100644
--- a/packages/trace-viewer/src/ui/uiModeView.tsx
+++ b/packages/trace-viewer/src/ui/uiModeView.tsx
@@ -95,6 +95,7 @@ export const UIModeView: React.FC<{}> = ({
 
   React.useEffect(() => {
     inputRef.current?.focus();
+    setIsLoading(true);
     initWebSocket(() => setIsDisconnected(true)).then(() => reloadTests());
   }, [reloadTests]);
 
@@ -403,7 +404,7 @@ const TestList: React.FC<{
 
   // Update watch all.
   React.useEffect(() => {
-    if (!testModel.rootSuite)
+    if (isLoading)
       return;
     if (watchAll) {
       sendMessageNoReply('watch', { fileNames: [...fileNames] });
@@ -417,7 +418,7 @@ const TestList: React.FC<{
       }
       sendMessageNoReply('watch', { fileNames: [...fileNames] });
     }
-  }, [testModel, rootItem, fileNames, watchAll, watchedTreeIds, treeItemMap]);
+  }, [isLoading, rootItem, fileNames, watchAll, watchedTreeIds, treeItemMap]);
 
   const runTreeItem = (treeItem: TreeItem) => {
     setSelectedTreeItemId(treeItem.id);