diff --git a/tests/Berufsschule_HAM.E2ETests/Helper/AssetsHelper.cs b/tests/Berufsschule_HAM.E2ETests/Helper/AssetsHelper.cs
index 62c28cf..5e7fd81 100644
--- a/tests/Berufsschule_HAM.E2ETests/Helper/AssetsHelper.cs
+++ b/tests/Berufsschule_HAM.E2ETests/Helper/AssetsHelper.cs
@@ -16,6 +16,7 @@ public static class AssetsHelper
         createAssetButton.Click();
         AppHelper.AwaitVisible(driver, By.Id("createName"));
         driver.FindElement(By.Id("createName")).SendKeys(AppHelper.GetRandomName());
+        AppHelper.AwaitVisible(driver, By.Id("createLocationSelect-ts-control"));
         driver.FindElement(By.Id("createLocationSelect-ts-control")).Click();
         AppHelper.AwaitVisible(driver, By.Id("createLocationSelect-opt-1"));
         driver.ExecuteJavaScript("document.getElementById(\"createLocationSelect-opt-1\").click()");
diff --git a/tests/Berufsschule_HAM.E2ETests/Helper/UsersHelper.cs b/tests/Berufsschule_HAM.E2ETests/Helper/UsersHelper.cs
index 0090844..e4fcb19 100644
--- a/tests/Berufsschule_HAM.E2ETests/Helper/UsersHelper.cs
+++ b/tests/Berufsschule_HAM.E2ETests/Helper/UsersHelper.cs
@@ -20,6 +20,7 @@ public static class UsersHelper
         driver.FindElement(By.Id("createStreetNr")).SendKeys("42");
 
         driver.FindElement(By.Id("createWorkplace")).Click();
+        AppHelper.AwaitVisible(driver, By.Id("createWorkplace"));
         driver.ExecuteJavaScript("document.getElementById(\"createWorkplace\").children[1].selected = true");
         driver.FindElement(By.Id("createGroups")).FindElement(By.CssSelector("*")).Click();