diff --git a/R/TealAppDriver.R b/R/TealAppDriver.R
index 835be00b2d..3a45ba12c8 100644
--- a/R/TealAppDriver.R
+++ b/R/TealAppDriver.R
@@ -73,7 +73,7 @@ TealAppDriver <- R6::R6Class( # nolint: object_name.
     #' @param ... arguments passed to parent [`shinytest2::AppDriver`] `click()` method.
     click = function(...) {
       super$click(...)
-      self$wait_for_idle(5000)
+      self$wait_for_idle()
     },
     #' @description
     #' Check if the app has shiny errors. This checks for global shiny errors.
@@ -232,6 +232,8 @@ TealAppDriver <- R6::R6Class( # nolint: object_name.
         value,
         ...
       )
+      dots <- rlang::list2(...)
+      if (!isFALSE(dots[[wait]])) self$wait_for_idle() # Default behavior is to wait
       invisible(self)
     },
     #' @description