diff --git a/test/taiko/apps.js b/test/taiko/apps.js
index ba4aafd8e086310ce4372112a1ef5a6196b87396..ef06c6ce28eee7d9a821c9aa65f089e84fc6052b 100644
--- a/test/taiko/apps.js
+++ b/test/taiko/apps.js
@@ -15,8 +15,6 @@ const assert = require('assert');
     await openBrowser()
     // await screencast.startScreencast('output.gif')
 
-    // Wait for manual screencast recording
-    // await waitFor(5000)
 
     // Nextcloud
     if (taikoTests.includes('nextcloud') || taikoTests === 'all') {
@@ -31,7 +29,12 @@ const assert = require('assert');
 
       await click('Log in')
 
-      // Close potential nextcloud modal
+      // Close potential nextcloud first run wizard modal
+      // https://github.com/nextcloud/firstrunwizard/issues/488
+      // Unfortunately, we need to sleep a while since I haven't found a
+      // good way that closes the modal *if* it pops up, since these
+      // tests should also work on subsequent logins.
+      await waitFor(5000)
       await press('Escape')
 
       // Open document and type some text