diff --git a/core/client.js b/core/client.js
index 78621f40..50f30820 100644
--- a/core/client.js
+++ b/core/client.js
@@ -382,8 +382,8 @@ class TfNavigationElement extends LitElement {
 					<link type="text/css" rel="stylesheet" href="/static/w3.css" />
 					<div class="w3-model w3-animate-top" style="position: absolute; left: 50%; transform: translate(-50%); z-index: 1">
 						<dijv class="w3-modal-content w3-card-4" style="display: block; padding: 1em">
-							<span @click=${self.clear_error} class="w3-button w3-display-topright">&times;</span>
-							<div style="color: ${this.status.color ?? kErrorColor}"><b>ERROR:</b><p style="white-space: pre">${this.status.message}</p></div>
+							<span id="close_error" @click=${self.clear_error} class="w3-button w3-display-topright">&times;</span>
+							<div style="color: ${this.status.color ?? kErrorColor}"><b>ERROR:</b><p id="error" style="white-space: pre">${this.status.message}</p></div>
 						</div>
 					</div>
 					`
diff --git a/tools/autotest.py b/tools/autotest.py
index e738de4b..ae424b88 100755
--- a/tools/autotest.py
+++ b/tools/autotest.py
@@ -60,6 +60,13 @@ try:
 	wait.until(expected_conditions.presence_of_element_located((By.ID, 'document')))
 	driver.get('http://localhost:8888/~testuser/test/')
 	wait.until(expected_conditions.presence_of_element_located((By.ID, 'document')))
+	while True:
+		try:
+			wait.until(exists_in_shadow_root(driver.find_element(By.TAG_NAME, 'tf-navigation').shadow_root, By.ID, 'close_error')).click()
+			break
+		except:
+			pass
+
 	driver.find_element(By.TAG_NAME, 'tf-navigation').shadow_root.find_element(By.LINK_TEXT, 'edit').click()
 	editor = driver.find_element(By.ID, 'editor').find_element(By.CLASS_NAME, 'cm-content')
 	editor.click()
@@ -72,7 +79,16 @@ try:
 
 	driver.switch_to.default_content()
 	driver.find_element(By.ID, 'delete').click()
+	wait.until(expected_conditions.alert_is_present()).accept()
 	wait.until(expected_conditions.alert_is_present()).dismiss()
+	driver.get('http://localhost:8888/~testuser/test/')
+	wait.until(expected_conditions.presence_of_element_located((By.ID, 'document')))
+	while True:
+		try:
+			wait.until(exists_in_shadow_root(driver.find_element(By.TAG_NAME, 'tf-navigation').shadow_root, By.ID, 'close_error')).click()
+			break
+		except:
+			pass
 
 	driver.get('http://localhost:8888')