diff --git a/src/main/java/org/jenkinsci/test/acceptance/po/Folder.java b/src/main/java/org/jenkinsci/test/acceptance/po/Folder.java
index 8c2062dfea..afaa705b46 100644
--- a/src/main/java/org/jenkinsci/test/acceptance/po/Folder.java
+++ b/src/main/java/org/jenkinsci/test/acceptance/po/Folder.java
@@ -70,8 +70,7 @@ public ViewsMixIn getViews() {
     @Override
     public void delete() {
         open();
-        clickLink("Delete Folder");
-        waitFor(by.button("Yes")).click();
+        runThenHandleDialog(() -> clickLink("Delete Folder"));
     }
 
     public void setEnvironmentalVariables(final Map<String, String> envVbles) {