diff --git a/src/main/java/org/jenkinsci/test/acceptance/po/Job.java b/src/main/java/org/jenkinsci/test/acceptance/po/Job.java
index b1c2fb28d5..6c59788bb4 100644
--- a/src/main/java/org/jenkinsci/test/acceptance/po/Job.java
+++ b/src/main/java/org/jenkinsci/test/acceptance/po/Job.java
@@ -365,7 +365,8 @@ public <T extends Parameter> T addParameter(Class<T> type) {
 
         control(by.checkbox("This project is parameterized")).check();
 
-        control(by.xpath("//button[text()='Add Parameter']")).selectDropdownMenu(type);
+        control(by.xpath("//button[text()='Add Parameter' and not(contains(@class, 'hetero-list-add-top'))]"))
+                .selectDropdownMenu(type);
 
         // TODO selectDropdownMenu should not need this sleep - try and remove it
         elasticSleep(500);