diff --git a/src/common/UITestAutomation/Element/Element.cs b/src/common/UITestAutomation/Element/Element.cs
index 6414810072..4790a0af20 100644
--- a/src/common/UITestAutomation/Element/Element.cs
+++ b/src/common/UITestAutomation/Element/Element.cs
@@ -157,7 +157,7 @@ namespace Microsoft.PowerToys.UITest
         /// <param name="by">The selector to use for finding the element.</param>
         /// <param name="timeoutMS">The timeout in milliseconds.</param>
         /// <returns>The found element.</returns>
-        public T Find<T>(By by, int timeoutMS = 3000)
+        public T Find<T>(By by, int timeoutMS = 5000)
             where T : Element, new()
         {
             Assert.IsNotNull(this.windowsElement, $"WindowsElement is null in method Find<{typeof(T).Name}> with parameters: by = {by}, timeoutMS = {timeoutMS}");
@@ -178,7 +178,7 @@ namespace Microsoft.PowerToys.UITest
         /// <param name="name">The name for finding the element.</param>
         /// <param name="timeoutMS">The timeout in milliseconds.</param>
         /// <returns>The found element.</returns>
-        public T Find<T>(string name, int timeoutMS = 3000)
+        public T Find<T>(string name, int timeoutMS = 5000)
             where T : Element, new()
         {
             return this.Find<T>(By.Name(name), timeoutMS);
@@ -191,7 +191,7 @@ namespace Microsoft.PowerToys.UITest
         /// <param name="by">The selector to use for finding the element.</param>
         /// <param name="timeoutMS">The timeout in milliseconds.</param>
         /// <returns>The found element.</returns>
-        public Element Find(By by, int timeoutMS = 3000)
+        public Element Find(By by, int timeoutMS = 5000)
         {
             return this.Find<Element>(by, timeoutMS);
         }
@@ -203,7 +203,7 @@ namespace Microsoft.PowerToys.UITest
         /// <param name="name">The name for finding the element.</param>
         /// <param name="timeoutMS">The timeout in milliseconds.</param>
         /// <returns>The found element.</returns>
-        public Element Find(string name, int timeoutMS = 3000)
+        public Element Find(string name, int timeoutMS = 5000)
         {
             return this.Find<Element>(By.Name(name), timeoutMS);
         }
@@ -215,7 +215,7 @@ namespace Microsoft.PowerToys.UITest
         /// <param name="by">The selector to use for finding the elements.</param>
         /// <param name="timeoutMS">The timeout in milliseconds.</param>
         /// <returns>A read-only collection of the found elements.</returns>
-        public ReadOnlyCollection<T> FindAll<T>(By by, int timeoutMS = 3000)
+        public ReadOnlyCollection<T> FindAll<T>(By by, int timeoutMS = 5000)
             where T : Element, new()
         {
             Assert.IsNotNull(this.windowsElement, $"WindowsElement is null in method FindAll<{typeof(T).Name}> with parameters: by = {by}, timeoutMS = {timeoutMS}");
@@ -239,7 +239,7 @@ namespace Microsoft.PowerToys.UITest
         /// <param name="name">The name for finding the element.</param>
         /// <param name="timeoutMS">The timeout in milliseconds.</param>
         /// <returns>A read-only collection of the found elements.</returns>
-        public ReadOnlyCollection<T> FindAll<T>(string name, int timeoutMS = 3000)
+        public ReadOnlyCollection<T> FindAll<T>(string name, int timeoutMS = 5000)
             where T : Element, new()
         {
             return this.FindAll<T>(By.Name(name), timeoutMS);
@@ -252,7 +252,7 @@ namespace Microsoft.PowerToys.UITest
         /// <param name="by">The selector to use for finding the elements.</param>
         /// <param name="timeoutMS">The timeout in milliseconds.</param>
         /// <returns>A read-only collection of the found elements.</returns>
-        public ReadOnlyCollection<Element> FindAll(By by, int timeoutMS = 3000)
+        public ReadOnlyCollection<Element> FindAll(By by, int timeoutMS = 5000)
         {
             return this.FindAll<Element>(by, timeoutMS);
         }
@@ -264,7 +264,7 @@ namespace Microsoft.PowerToys.UITest
         /// <param name="name">The name for finding the element.</param>
         /// <param name="timeoutMS">The timeout in milliseconds.</param>
         /// <returns>A read-only collection of the found elements.</returns>
-        public ReadOnlyCollection<Element> FindAll(string name, int timeoutMS = 3000)
+        public ReadOnlyCollection<Element> FindAll(string name, int timeoutMS = 5000)
         {
             return this.FindAll<Element>(By.Name(name), timeoutMS);
         }
diff --git a/src/common/UITestAutomation/FindHelper.cs b/src/common/UITestAutomation/FindHelper.cs
index 5f25dfcb15..f5a460acca 100644
--- a/src/common/UITestAutomation/FindHelper.cs
+++ b/src/common/UITestAutomation/FindHelper.cs
@@ -20,7 +20,7 @@ namespace Microsoft.PowerToys.UITest
         public static ReadOnlyCollection<T>? FindAll<T, TW>(Func<ReadOnlyCollection<TW>> findElementsFunc, WindowsDriver<WindowsElement>? driver, int timeoutMS)
             where T : Element, new()
         {
-            var items = findElementsFunc();
+            var items = FindElementsWithRetry(findElementsFunc, timeoutMS);
             var res = items.Select(item =>
             {
                 var element = item as WindowsElement;
@@ -30,6 +30,27 @@ namespace Microsoft.PowerToys.UITest
             return new ReadOnlyCollection<T>(res);
         }
 
+        private static ReadOnlyCollection<TW> FindElementsWithRetry<TW>(Func<ReadOnlyCollection<TW>> findElementsFunc, int timeoutMS)
+{
+            int retryIntervalMS = 500;
+            timeoutMS = 1;
+            int elapsedTime = 0;
+
+            while (elapsedTime < timeoutMS)
+            {
+                var items = findElementsFunc();
+                if (items.Count > 0)
+                {
+                    return items;
+                }
+
+                Task.Delay(retryIntervalMS).Wait();
+                elapsedTime += retryIntervalMS;
+            }
+
+            return new ReadOnlyCollection<TW>(new List<TW>());
+        }
+
         public static T NewElement<T>(WindowsElement? element, WindowsDriver<WindowsElement>? driver, int timeoutMS)
              where T : Element, new()
         {
@@ -37,11 +58,6 @@ namespace Microsoft.PowerToys.UITest
             Assert.IsNotNull(element, $"New Element {typeof(T).Name} error: element is null.");
 
             T newElement = new T();
-            if (timeoutMS > 0)
-            {
-                // Only set timeout if it is positive value
-                driver.Manage().Timeouts().ImplicitWait = TimeSpan.FromMilliseconds(timeoutMS);
-            }
 
             newElement.SetSession(driver);
             newElement.SetWindowsElement(element);
diff --git a/src/common/UITestAutomation/Session.cs b/src/common/UITestAutomation/Session.cs
index 26bced8cb5..0ff01d3695 100644
--- a/src/common/UITestAutomation/Session.cs
+++ b/src/common/UITestAutomation/Session.cs
@@ -85,9 +85,9 @@ namespace Microsoft.PowerToys.UITest
         /// </summary>
         /// <typeparam name="T">The class of the element, should be Element or its derived class.</typeparam>
         /// <param name="by">The selector to find the element.</param>
-        /// <param name="timeoutMS">The timeout in milliseconds (default is 3000).</param>
+        /// <param name="timeoutMS">The timeout in milliseconds (default is 5000).</param>
         /// <returns>The found element.</returns>
-        public T Find<T>(By by, int timeoutMS = 3000)
+        public T Find<T>(By by, int timeoutMS = 5000)
             where T : Element, new()
         {
             Assert.IsNotNull(this.WindowsDriver, $"WindowsElement is null in method Find<{typeof(T).Name}> with parameters: by = {by}, timeoutMS = {timeoutMS}");
@@ -105,9 +105,9 @@ namespace Microsoft.PowerToys.UITest
         /// </summary>
         /// <typeparam name="T">The class of the element, should be Element or its derived class.</typeparam>
         /// <param name="name">The name of the element.</param>
-        /// <param name="timeoutMS">The timeout in milliseconds (default is 3000).</param>
+        /// <param name="timeoutMS">The timeout in milliseconds (default is 5000).</param>
         /// <returns>The found element.</returns>
-        public T Find<T>(string name, int timeoutMS = 3000)
+        public T Find<T>(string name, int timeoutMS = 5000)
             where T : Element, new()
         {
             return this.Find<T>(By.Name(name), timeoutMS);
@@ -117,9 +117,9 @@ namespace Microsoft.PowerToys.UITest
         /// Shortcut for this.Find<Element>(by, timeoutMS)
         /// </summary>
         /// <param name="by">The selector to find the element.</param>
-        /// <param name="timeoutMS">The timeout in milliseconds (default is 3000).</param>
+        /// <param name="timeoutMS">The timeout in milliseconds (default is 5000).</param>
         /// <returns>The found element.</returns>
-        public Element Find(By by, int timeoutMS = 3000)
+        public Element Find(By by, int timeoutMS = 5000)
         {
             return this.Find<Element>(by, timeoutMS);
         }
@@ -128,9 +128,9 @@ namespace Microsoft.PowerToys.UITest
         /// Shortcut for this.Find<Element>(By.Name(name), timeoutMS)
         /// </summary>
         /// <param name="name">The name of the element.</param>
-        /// <param name="timeoutMS">The timeout in milliseconds (default is 3000).</param>
+        /// <param name="timeoutMS">The timeout in milliseconds (default is 5000).</param>
         /// <returns>The found element.</returns>
-        public Element Find(string name, int timeoutMS = 3000)
+        public Element Find(string name, int timeoutMS = 5000)
         {
             return this.Find<Element>(By.Name(name), timeoutMS);
         }
@@ -140,9 +140,9 @@ namespace Microsoft.PowerToys.UITest
         /// </summary>
         /// <typeparam name="T">The class of the element, should be Element or its derived class.</typeparam>
         /// <param name="by">The name of the element.</param>
-        /// <param name="timeoutMS">The timeout in milliseconds (default is 3000).</param>
+        /// <param name="timeoutMS">The timeout in milliseconds (default is 5000).</param>
         /// <returns>True if only has one element, otherwise false.</returns>
-        public bool HasOne<T>(By by, int timeoutMS = 3000)
+        public bool HasOne<T>(By by, int timeoutMS = 5000)
             where T : Element, new()
         {
             return this.FindAll<T>(by, timeoutMS).Count == 1;
@@ -152,9 +152,9 @@ namespace Microsoft.PowerToys.UITest
         /// Shortcut for this.HasOne<Element>(by, timeoutMS)
         /// </summary>
         /// <param name="by">The name of the element.</param>
-        /// <param name="timeoutMS">The timeout in milliseconds (default is 3000).</param>
+        /// <param name="timeoutMS">The timeout in milliseconds (default is 5000).</param>
         /// <returns>True if only has one element, otherwise false.</returns>
-        public bool HasOne(By by, int timeoutMS = 3000)
+        public bool HasOne(By by, int timeoutMS = 5000)
         {
             return this.HasOne<Element>(by, timeoutMS);
         }
@@ -164,9 +164,9 @@ namespace Microsoft.PowerToys.UITest
         /// </summary>
         /// <typeparam name="T">The class of the element, should be Element or its derived class.</typeparam>
         /// <param name="name">The name of the element.</param>
-        /// <param name="timeoutMS">The timeout in milliseconds (default is 3000).</param>
+        /// <param name="timeoutMS">The timeout in milliseconds (default is 5000).</param>
         /// <returns>True if only has one element, otherwise false.</returns>
-        public bool HasOne<T>(string name, int timeoutMS = 3000)
+        public bool HasOne<T>(string name, int timeoutMS = 5000)
             where T : Element, new()
         {
             return this.HasOne<T>(By.Name(name), timeoutMS);
@@ -176,9 +176,9 @@ namespace Microsoft.PowerToys.UITest
         /// Shortcut for this.HasOne<Element>(name, timeoutMS)
         /// </summary>
         /// <param name="name">The name of the element.</param>
-        /// <param name="timeoutMS">The timeout in milliseconds (default is 3000).</param>
+        /// <param name="timeoutMS">The timeout in milliseconds (default is 5000).</param>
         /// <returns>True if only has one element, otherwise false.</returns>
-        public bool HasOne(string name, int timeoutMS = 3000)
+        public bool HasOne(string name, int timeoutMS = 5000)
         {
             return this.HasOne<Element>(By.Name(name), timeoutMS);
         }
@@ -188,9 +188,9 @@ namespace Microsoft.PowerToys.UITest
         /// </summary>
         /// <typeparam name="T">The class of the element, should be Element or its derived class.</typeparam>
         /// <param name="by">The selector to find the element.</param>
-        /// <param name="timeoutMS">The timeout in milliseconds (default is 3000).</param>
+        /// <param name="timeoutMS">The timeout in milliseconds (default is 5000).</param>
         /// <returns>True if  has one or more element, otherwise false.</returns>
-        public bool Has<T>(By by, int timeoutMS = 3000)
+        public bool Has<T>(By by, int timeoutMS = 5000)
             where T : Element, new()
         {
             return this.FindAll<T>(by, timeoutMS).Count >= 1;
@@ -200,9 +200,9 @@ namespace Microsoft.PowerToys.UITest
         /// Shortcut for this.Has<Element>(by, timeoutMS)
         /// </summary>
         /// <param name="by">The selector to find the element.</param>
-        /// <param name="timeoutMS">The timeout in milliseconds (default is 3000).</param>
+        /// <param name="timeoutMS">The timeout in milliseconds (default is 5000).</param>
         /// <returns>True if  has one or more element, otherwise false.</returns>
-        public bool Has(By by, int timeoutMS = 3000)
+        public bool Has(By by, int timeoutMS = 5000)
         {
             return this.Has<Element>(by, timeoutMS);
         }
@@ -212,9 +212,9 @@ namespace Microsoft.PowerToys.UITest
         /// </summary>
         /// <typeparam name="T">The class of the element, should be Element or its derived class.</typeparam>
         /// <param name="name">The name of the element.</param>
-        /// <param name="timeoutMS">The timeout in milliseconds (default is 3000).</param>
+        /// <param name="timeoutMS">The timeout in milliseconds (default is 5000).</param>
         /// <returns>True if  has one or more element, otherwise false.</returns>
-        public bool Has<T>(string name, int timeoutMS = 3000)
+        public bool Has<T>(string name, int timeoutMS = 5000)
             where T : Element, new()
         {
             return this.Has<T>(By.Name(name), timeoutMS);
@@ -224,9 +224,9 @@ namespace Microsoft.PowerToys.UITest
         /// Shortcut for this.Has<Element>(name, timeoutMS)
         /// </summary>
         /// <param name="name">The name of the element.</param>
-        /// <param name="timeoutMS">The timeout in milliseconds (default is 3000).</param>
+        /// <param name="timeoutMS">The timeout in milliseconds (default is 5000).</param>
         /// <returns>True if  has one or more element, otherwise false.</returns>
-        public bool Has(string name, int timeoutMS = 3000)
+        public bool Has(string name, int timeoutMS = 5000)
         {
             return this.Has<Element>(name, timeoutMS);
         }
@@ -236,9 +236,9 @@ namespace Microsoft.PowerToys.UITest
         /// </summary>
         /// <typeparam name="T">The class of the elements, should be Element or its derived class.</typeparam>
         /// <param name="by">The selector to find the elements.</param>
-        /// <param name="timeoutMS">The timeout in milliseconds (default is 3000).</param>
+        /// <param name="timeoutMS">The timeout in milliseconds (default is 5000).</param>
         /// <returns>A read-only collection of the found elements.</returns>
-        public ReadOnlyCollection<T> FindAll<T>(By by, int timeoutMS = 3000)
+        public ReadOnlyCollection<T> FindAll<T>(By by, int timeoutMS = 5000)
             where T : Element, new()
         {
             Assert.IsNotNull(this.WindowsDriver, $"WindowsElement is null in method FindAll<{typeof(T).Name}> with parameters: by = {by}, timeoutMS = {timeoutMS}");
@@ -260,9 +260,9 @@ namespace Microsoft.PowerToys.UITest
         /// </summary>
         /// <typeparam name="T">The class of the elements, should be Element or its derived class.</typeparam>
         /// <param name="name">The name to find the elements.</param>
-        /// <param name="timeoutMS">The timeout in milliseconds (default is 3000).</param>
+        /// <param name="timeoutMS">The timeout in milliseconds (default is 5000).</param>
         /// <returns>A read-only collection of the found elements.</returns>
-        public ReadOnlyCollection<T> FindAll<T>(string name, int timeoutMS = 3000)
+        public ReadOnlyCollection<T> FindAll<T>(string name, int timeoutMS = 5000)
             where T : Element, new()
         {
             return this.FindAll<T>(By.Name(name), timeoutMS);
@@ -273,9 +273,9 @@ namespace Microsoft.PowerToys.UITest
         /// Shortcut for this.FindAll<Element>(by, timeoutMS)
         /// </summary>
         /// <param name="by">The selector to find the elements.</param>
-        /// <param name="timeoutMS">The timeout in milliseconds (default is 3000).</param>
+        /// <param name="timeoutMS">The timeout in milliseconds (default is 5000).</param>
         /// <returns>A read-only collection of the found elements.</returns>
-        public ReadOnlyCollection<Element> FindAll(By by, int timeoutMS = 3000)
+        public ReadOnlyCollection<Element> FindAll(By by, int timeoutMS = 5000)
         {
             return this.FindAll<Element>(by, timeoutMS);
         }
@@ -285,9 +285,9 @@ namespace Microsoft.PowerToys.UITest
         /// Shortcut for this.FindAll<Element>(By.Name(name), timeoutMS)
         /// </summary>
         /// <param name="name">The name to find the elements.</param>
-        /// <param name="timeoutMS">The timeout in milliseconds (default is 3000).</param>
+        /// <param name="timeoutMS">The timeout in milliseconds (default is 5000).</param>
         /// <returns>A read-only collection of the found elements.</returns>
-        public ReadOnlyCollection<Element> FindAll(string name, int timeoutMS = 3000)
+        public ReadOnlyCollection<Element> FindAll(string name, int timeoutMS = 5000)
         {
             return this.FindAll<Element>(By.Name(name), timeoutMS);
         }
@@ -416,9 +416,6 @@ namespace Microsoft.PowerToys.UITest
 
                 this.windowHandlers.Add(this.MainWindowHandler);
 
-                // Set implicit timeout to make element search retry every 500 ms
-                this.WindowsDriver.Manage().Timeouts().ImplicitWait = TimeSpan.FromSeconds(3);
-
                 if (size != WindowSize.UnSpecified)
                 {
                     this.SetMainWindowSize(size);
diff --git a/src/common/UITestAutomation/SessionHelper.cs b/src/common/UITestAutomation/SessionHelper.cs
index 3590c80fbb..2061c97001 100644
--- a/src/common/UITestAutomation/SessionHelper.cs
+++ b/src/common/UITestAutomation/SessionHelper.cs
@@ -41,9 +41,6 @@ namespace Microsoft.PowerToys.UITest
             var desktopCapabilities = new AppiumOptions();
             desktopCapabilities.AddAdditionalCapability("app", "Root");
             this.Root = new WindowsDriver<WindowsElement>(new Uri(ModuleConfigData.Instance.GetWindowsApplicationDriverUrl()), desktopCapabilities);
-
-            // Set default timeout to 5 seconds
-            this.Root.Manage().Timeouts().ImplicitWait = TimeSpan.FromSeconds(5);
         }
 
         /// <summary>
@@ -59,9 +56,6 @@ namespace Microsoft.PowerToys.UITest
 
             Assert.IsNotNull(this.Driver, $"Failed to initialize the test environment. Driver is null.");
 
-            // Set default timeout to 5 seconds
-            this.Driver.Manage().Timeouts().ImplicitWait = TimeSpan.FromSeconds(5);
-
             return this;
         }
 
diff --git a/src/common/UITestAutomation/UITestBase.cs b/src/common/UITestAutomation/UITestBase.cs
index 494f622be5..288fd42ce1 100644
--- a/src/common/UITestAutomation/UITestBase.cs
+++ b/src/common/UITestAutomation/UITestBase.cs
@@ -69,9 +69,9 @@ namespace Microsoft.PowerToys.UITest
         /// </summary>
         /// <typeparam name="T">The class of the element, should be Element or its derived class.</typeparam>
         /// <param name="by">The selector to find the element.</param>
-        /// <param name="timeoutMS">The timeout in milliseconds (default is 3000).</param>
+        /// <param name="timeoutMS">The timeout in milliseconds (default is 5000).</param>
         /// <returns>The found element.</returns>
-        protected T Find<T>(By by, int timeoutMS = 3000)
+        protected T Find<T>(By by, int timeoutMS = 5000)
             where T : Element, new()
         {
             return this.Session.Find<T>(by, timeoutMS);
@@ -82,9 +82,9 @@ namespace Microsoft.PowerToys.UITest
         /// </summary>
         /// <typeparam name="T">The class of the element, should be Element or its derived class.</typeparam>
         /// <param name="name">The name of the element.</param>
-        /// <param name="timeoutMS">The timeout in milliseconds (default is 3000).</param>
+        /// <param name="timeoutMS">The timeout in milliseconds (default is 5000).</param>
         /// <returns>The found element.</returns>
-        protected T Find<T>(string name, int timeoutMS = 3000)
+        protected T Find<T>(string name, int timeoutMS = 5000)
             where T : Element, new()
         {
             return this.Session.Find<T>(By.Name(name), timeoutMS);
@@ -94,9 +94,9 @@ namespace Microsoft.PowerToys.UITest
         /// Shortcut for this.Session.Find<Element>(by, timeoutMS)
         /// </summary>
         /// <param name="by">The selector to find the element.</param>
-        /// <param name="timeoutMS">The timeout in milliseconds (default is 3000).</param>
+        /// <param name="timeoutMS">The timeout in milliseconds (default is 5000).</param>
         /// <returns>The found element.</returns>
-        protected Element Find(By by, int timeoutMS = 3000)
+        protected Element Find(By by, int timeoutMS = 5000)
         {
             return this.Session.Find(by, timeoutMS);
         }
@@ -105,9 +105,9 @@ namespace Microsoft.PowerToys.UITest
         /// Shortcut for this.Session.Find<Element>(name, timeoutMS)
         /// </summary>
         /// <param name="name">The name of the element.</param>
-        /// <param name="timeoutMS">The timeout in milliseconds (default is 3000).</param>
+        /// <param name="timeoutMS">The timeout in milliseconds (default is 5000).</param>
         /// <returns>The found element.</returns>
-        protected Element Find(string name, int timeoutMS = 3000)
+        protected Element Find(string name, int timeoutMS = 5000)
         {
             return this.Session.Find(name, timeoutMS);
         }
@@ -117,9 +117,9 @@ namespace Microsoft.PowerToys.UITest
         /// </summary>
         /// <typeparam name="T">The class of the element, should be Element or its derived class.</typeparam>
         /// <param name="by">The name of the element.</param>
-        /// <param name="timeoutMS">The timeout in milliseconds (default is 3000).</param>
+        /// <param name="timeoutMS">The timeout in milliseconds (default is 5000).</param>
         /// <returns>True if only has one element, otherwise false.</returns>
-        public bool HasOne<T>(By by, int timeoutMS = 3000)
+        public bool HasOne<T>(By by, int timeoutMS = 5000)
             where T : Element, new()
         {
             return this.FindAll<T>(by, timeoutMS).Count == 1;
@@ -129,9 +129,9 @@ namespace Microsoft.PowerToys.UITest
         /// Shortcut for this.Session.HasOne<Element>(by, timeoutMS)
         /// </summary>
         /// <param name="by">The name of the element.</param>
-        /// <param name="timeoutMS">The timeout in milliseconds (default is 3000).</param>
+        /// <param name="timeoutMS">The timeout in milliseconds (default is 5000).</param>
         /// <returns>True if only has one element, otherwise false.</returns>
-        public bool HasOne(By by, int timeoutMS = 3000)
+        public bool HasOne(By by, int timeoutMS = 5000)
         {
             return this.Session.HasOne<Element>(by, timeoutMS);
         }
@@ -141,9 +141,9 @@ namespace Microsoft.PowerToys.UITest
         /// </summary>
         /// <typeparam name="T">The class of the element, should be Element or its derived class.</typeparam>
         /// <param name="name">The name of the element.</param>
-        /// <param name="timeoutMS">The timeout in milliseconds (default is 3000).</param>
+        /// <param name="timeoutMS">The timeout in milliseconds (default is 5000).</param>
         /// <returns>True if only has one element, otherwise false.</returns>
-        public bool HasOne<T>(string name, int timeoutMS = 3000)
+        public bool HasOne<T>(string name, int timeoutMS = 5000)
             where T : Element, new()
         {
             return this.Session.HasOne<T>(By.Name(name), timeoutMS);
@@ -153,9 +153,9 @@ namespace Microsoft.PowerToys.UITest
         /// Shortcut for this.Session.HasOne<Element>(name, timeoutMS)
         /// </summary>
         /// <param name="name">The name of the element.</param>
-        /// <param name="timeoutMS">The timeout in milliseconds (default is 3000).</param>
+        /// <param name="timeoutMS">The timeout in milliseconds (default is 5000).</param>
         /// <returns>True if only has one element, otherwise false.</returns>
-        public bool HasOne(string name, int timeoutMS = 3000)
+        public bool HasOne(string name, int timeoutMS = 5000)
         {
             return this.Session.HasOne<Element>(name, timeoutMS);
         }
@@ -165,9 +165,9 @@ namespace Microsoft.PowerToys.UITest
         /// </summary>
         /// <typeparam name="T">The class of the element, should be Element or its derived class.</typeparam>
         /// <param name="by">The selector to find the element.</param>
-        /// <param name="timeoutMS">The timeout in milliseconds (default is 3000).</param>
+        /// <param name="timeoutMS">The timeout in milliseconds (default is 5000).</param>
         /// <returns>True if  has one or more element, otherwise false.</returns>
-        public bool Has<T>(By by, int timeoutMS = 3000)
+        public bool Has<T>(By by, int timeoutMS = 5000)
             where T : Element, new()
         {
             return this.Session.FindAll<T>(by, timeoutMS).Count >= 1;
@@ -177,9 +177,9 @@ namespace Microsoft.PowerToys.UITest
         /// Shortcut for this.Session.Has<Element>(by, timeoutMS)
         /// </summary>
         /// <param name="by">The selector to find the element.</param>
-        /// <param name="timeoutMS">The timeout in milliseconds (default is 3000).</param>
+        /// <param name="timeoutMS">The timeout in milliseconds (default is 5000).</param>
         /// <returns>True if  has one or more element, otherwise false.</returns>
-        public bool Has(By by, int timeoutMS = 3000)
+        public bool Has(By by, int timeoutMS = 5000)
         {
             return this.Session.Has<Element>(by, timeoutMS);
         }
@@ -189,9 +189,9 @@ namespace Microsoft.PowerToys.UITest
         /// </summary>
         /// <typeparam name="T">The class of the element, should be Element or its derived class.</typeparam>
         /// <param name="name">The name of the element.</param>
-        /// <param name="timeoutMS">The timeout in milliseconds (default is 3000).</param>
+        /// <param name="timeoutMS">The timeout in milliseconds (default is 5000).</param>
         /// <returns>True if  has one or more element, otherwise false.</returns>
-        public bool Has<T>(string name, int timeoutMS = 3000)
+        public bool Has<T>(string name, int timeoutMS = 5000)
             where T : Element, new()
         {
             return this.Session.Has<T>(By.Name(name), timeoutMS);
@@ -201,9 +201,9 @@ namespace Microsoft.PowerToys.UITest
         /// Shortcut for this.Session.Has<Element>(name, timeoutMS)
         /// </summary>
         /// <param name="name">The name of the element.</param>
-        /// <param name="timeoutMS">The timeout in milliseconds (default is 3000).</param>
+        /// <param name="timeoutMS">The timeout in milliseconds (default is 5000).</param>
         /// <returns>True if  has one or more element, otherwise false.</returns>
-        public bool Has(string name, int timeoutMS = 3000)
+        public bool Has(string name, int timeoutMS = 5000)
         {
             return this.Session.Has<Element>(name, timeoutMS);
         }
@@ -214,9 +214,9 @@ namespace Microsoft.PowerToys.UITest
         /// </summary>
         /// <typeparam name="T">The class of the elements, should be Element or its derived class.</typeparam>
         /// <param name="by">The selector to find the elements.</param>
-        /// <param name="timeoutMS">The timeout in milliseconds (default is 3000).</param>
+        /// <param name="timeoutMS">The timeout in milliseconds (default is 5000).</param>
         /// <returns>A read-only collection of the found elements.</returns>
-        protected ReadOnlyCollection<T> FindAll<T>(By by, int timeoutMS = 3000)
+        protected ReadOnlyCollection<T> FindAll<T>(By by, int timeoutMS = 5000)
             where T : Element, new()
         {
             return this.Session.FindAll<T>(by, timeoutMS);
@@ -228,9 +228,9 @@ namespace Microsoft.PowerToys.UITest
         /// </summary>
         /// <typeparam name="T">The class of the elements, should be Element or its derived class.</typeparam>
         /// <param name="name">The name of the elements.</param>
-        /// <param name="timeoutMS">The timeout in milliseconds (default is 3000).</param>
+        /// <param name="timeoutMS">The timeout in milliseconds (default is 5000).</param>
         /// <returns>A read-only collection of the found elements.</returns>
-        protected ReadOnlyCollection<T> FindAll<T>(string name, int timeoutMS = 3000)
+        protected ReadOnlyCollection<T> FindAll<T>(string name, int timeoutMS = 5000)
             where T : Element, new()
         {
             return this.Session.FindAll<T>(By.Name(name), timeoutMS);
@@ -241,9 +241,9 @@ namespace Microsoft.PowerToys.UITest
         /// Shortcut for this.Session.FindAll<Element>(by, timeoutMS)
         /// </summary>
         /// <param name="by">The selector to find the elements.</param>
-        /// <param name="timeoutMS">The timeout in milliseconds (default is 3000).</param>
+        /// <param name="timeoutMS">The timeout in milliseconds (default is 5000).</param>
         /// <returns>A read-only collection of the found elements.</returns>
-        protected ReadOnlyCollection<Element> FindAll(By by, int timeoutMS = 3000)
+        protected ReadOnlyCollection<Element> FindAll(By by, int timeoutMS = 5000)
         {
             return this.Session.FindAll<Element>(by, timeoutMS);
         }
@@ -253,9 +253,9 @@ namespace Microsoft.PowerToys.UITest
         /// Shortcut for this.Session.FindAll<Element>(By.Name(name), timeoutMS)
         /// </summary>
         /// <param name="name">The name of the elements.</param>
-        /// <param name="timeoutMS">The timeout in milliseconds (default is 3000).</param>
+        /// <param name="timeoutMS">The timeout in milliseconds (default is 5000).</param>
         /// <returns>A read-only collection of the found elements.</returns>
-        protected ReadOnlyCollection<Element> FindAll(string name, int timeoutMS = 3000)
+        protected ReadOnlyCollection<Element> FindAll(string name, int timeoutMS = 5000)
         {
             return this.Session.FindAll<Element>(By.Name(name), timeoutMS);
         }
diff --git a/src/modules/Hosts/Hosts.UITests/HostModuleTests.cs b/src/modules/Hosts/Hosts.UITests/HostModuleTests.cs
index fbdc92fbe7..681529c7ef 100644
--- a/src/modules/Hosts/Hosts.UITests/HostModuleTests.cs
+++ b/src/modules/Hosts/Hosts.UITests/HostModuleTests.cs
@@ -40,7 +40,7 @@ namespace Hosts.UITests
                 this.RemoveAllEntries();
 
                 // 'Add an entry' button (only show-up when list is empty) should be visible
-                Assert.IsTrue(this.HasOne<HyperlinkButton>("Add an entry1"), "'Add an entry' button should be visible in the empty view");
+                Assert.IsTrue(this.HasOne<HyperlinkButton>("Add an entry"), "'Add an entry' button should be visible in the empty view");
 
                 // VisualAssert.AreEqual(this.Find("Entries"), "EmptyView");
 
@@ -297,10 +297,7 @@ namespace Hosts.UITests
             foreach (var deleteBtn in this.FindAll<Button>("Delete"))
             {
                 deleteBtn.Click();
-                var window = this.Find<Window>(By.XPath("//Window[not(contains(@Name, 'Editor')) and not(contains(@Name, 'Popup'))]"));
-
-                window.Find<Button>("No");
-                window.Find<Button>("Yes").Click();
+                this.Find<Button>("Yes").Click();
             }
 
             // Should have no row left, and no more delete button