diff --git a/server/src/main/java/org/openqa/selenium/server/testgenerator/XlateHtmlSeleneseToJava.java b/server/src/main/java/org/openqa/selenium/server/testgenerator/XlateHtmlSeleneseToJava.java
index <HASH>..<HASH> 100644
--- a/server/src/main/java/org/openqa/selenium/server/testgenerator/XlateHtmlSeleneseToJava.java
+++ b/server/src/main/java/org/openqa/selenium/server/testgenerator/XlateHtmlSeleneseToJava.java
@@ -448,9 +448,7 @@ public class XlateHtmlSeleneseToJava {
             return beginning.replaceFirst("\n", "") + ": op not meaningful from rc client";

         }

         if (op.endsWith("AndWait")) {

-            if (!op.startsWith("click")) {

-                ending += EOL + "selenium.waitForPageToLoad(\"" + timeOut + "\");";

-            }

+            ending += EOL + "selenium.waitForPageToLoad(\"" + timeOut + "\");";

             op = op.replaceFirst("AndWait", "");

             tokens[0] = tokens[0].replaceFirst("AndWait", "");

         }
wait for page to load after when translating "clickAndWait"

r<I>