diff --git a/src/test/java/org/olat/util/FunctionalEPortfolioUtil.java b/src/test/java/org/olat/util/FunctionalEPortfolioUtil.java
index 4974b59c506d7f51f1aac4f30de75a2832ad0036..4796f3caf7e79a87eddab7bb90aeae2a114e5529 100644
--- a/src/test/java/org/olat/util/FunctionalEPortfolioUtil.java
+++ b/src/test/java/org/olat/util/FunctionalEPortfolioUtil.java
@@ -601,10 +601,6 @@ public class FunctionalEPortfolioUtil {
 		functionalUtil.waitForPageToLoadElement(browser, selectorBuffer.toString());
 		browser.click(selectorBuffer.toString());
 		
-		if(browser.isConfirmationPresent()){
-			browser.getConfirmation();
-		}
-		
 		functionalUtil.waitForPageToLoad(browser);
 		
 		boolean modified = false;
@@ -834,10 +830,6 @@ public class FunctionalEPortfolioUtil {
 		
 		functionalUtil.waitForPageToLoadElement(browser, selectorBuffer.toString());
 		browser.click(selectorBuffer.toString());
-
-		if(browser.isConfirmationPresent()){
-			browser.getConfirmation();
-		}
 		
 		functionalUtil.waitForPageToLoad(browser);
 		
@@ -1117,10 +1109,6 @@ public class FunctionalEPortfolioUtil {
 		functionalUtil.waitForPageToLoadElement(browser, selector);
 
 		browser.click(selector);
-		
-		if(browser.isConfirmationPresent()){
-			browser.getConfirmation();
-		}
 
 		StringBuffer locatorBuffer = new StringBuffer();
 
@@ -1140,10 +1128,6 @@ public class FunctionalEPortfolioUtil {
 			functionalUtil.waitForPageToLoadElement(browser, selector);
 	
 			browser.click(selector);
-
-			if(browser.isConfirmationPresent()){
-				browser.getConfirmation();
-			}
 			
 			locatorBuffer = new StringBuffer();
 	
@@ -1171,10 +1155,6 @@ public class FunctionalEPortfolioUtil {
 				functionalUtil.waitForPageToLoadElement(browser, selector);
 		
 				browser.click(selector);
-
-				if(browser.isConfirmationPresent()){
-					browser.getConfirmation();
-				}
 		
 				locatorBuffer = new StringBuffer();
 		
diff --git a/src/test/java/org/olat/util/FunctionalUtil.java b/src/test/java/org/olat/util/FunctionalUtil.java
index ff3d23984ed3a5054a99091eb2c329ac34b0b05a..45a9c964ca7c806ead2a463dbaa53032714a15d9 100644
--- a/src/test/java/org/olat/util/FunctionalUtil.java
+++ b/src/test/java/org/olat/util/FunctionalUtil.java
@@ -328,6 +328,11 @@ public class FunctionalUtil {
 		long startTime = Calendar.getInstance().getTimeInMillis();
 		long currentTime = startTime;
 		long waitLimit = TIMEOUT;
+
+		//FIXME:JK: this is really ugly. For better performance revise confirmation
+		if(browser.isConfirmationPresent()){
+			browser.getConfirmation();
+		}
 		
 		while(linkBusy(browser) && waitLimit >  currentTime - startTime){
 			try {