diff --git a/src/JoomlaBrowser.php b/src/JoomlaBrowser.php
index be1390c..f21afe0 100644
--- a/src/JoomlaBrowser.php
+++ b/src/JoomlaBrowser.php
@@ -158,7 +158,14 @@ public function installJoomlaRemovingInstallationFolder()
 
         $this->debug('Removing Installation Folder');
         $I->click(['xpath' => "//input[@value='Remove installation folder']"]);
-        $I->waitForElement(['xpath' => "//input[@value='Installation folder successfully removed']"]);
+        $I->debug('I wait for Removing Installation Folder button to become disabled');
+        $I->waitForElementChange(
+            ['xpath' => "//input[@name='instDefault']"],
+            function(WebDriverElement $el) {
+                return $el->isEnabled();
+            },
+            60
+        );
         $this->debug('Joomla is now installed');
         $I->see('Congratulations! Joomla! is now installed.',['xpath' => '//h3']);
     }