diff --git a/test/automation/src/terminal.ts b/test/automation/src/terminal.ts
index 19a75ca948a..472cb442206 100644
--- a/test/automation/src/terminal.ts
+++ b/test/automation/src/terminal.ts
@@ -247,7 +247,7 @@ export class Terminal {
 			}
 			if (icon) {
 				[icon, selector] = selector === Selector.EditorTab ? [`.codicon-${icon}`, selector] : [icon, `${selector} .codicon`];
-				await this.code.waitForElement(`${selector}`, singleTab => !!singleTab && !!singleTab.className.includes(icon));
+				await this.code.waitForElement(`${selector}`, singleTab => !!singleTab && !!icon && !!singleTab.className.includes(icon));
 			}
 		}
 	}