diff --git a/autotests/closedialoghelper.cpp b/autotests/closedialoghelper.cpp
index 440e6612f..332c3c2e1 100644
--- a/autotests/closedialoghelper.cpp
+++ b/autotests/closedialoghelper.cpp
@@ -39,7 +39,7 @@ CloseDialogHelper::~CloseDialogHelper()
 void CloseDialogHelper::closeDialog()
 {
     QWidget *dialog = (m_widget) ? m_widget->findChild<QDialog *>() : qApp->activeModalWidget();
-    if (!dialog) {
+    if (!dialog || !QTest::qWaitForWindowExposed(dialog)) {
         QTimer::singleShot(0, this, &CloseDialogHelper::closeDialog);
         return;
     }