diff --git a/plinth/templates/setup.html b/plinth/templates/setup.html
index 78a76fade..6d388ffc0 100644
--- a/plinth/templates/setup.html
+++ b/plinth/templates/setup.html
@@ -15,7 +15,9 @@
 
   {% if setup_state.value == 'up-to-date' %}
 
-     {% trans "Application installed." %}
+     <div class="app-just-installed">
+       {% trans "Application installed." %}
+     </div>
 
   {% elif not operations %}
 
diff --git a/plinth/tests/functional/__init__.py b/plinth/tests/functional/__init__.py
index e5880b0b9..2d2660fe6 100644
--- a/plinth/tests/functional/__init__.py
+++ b/plinth/tests/functional/__init__.py
@@ -342,7 +342,8 @@ def install(browser, app_name):
     install_button_css = '.form-install input[type=submit]'
     while True:
         script = 'return (document.readyState == "complete") && ' \
-            '(!Boolean(document.querySelector(".app-operation")));'
+            '(!Boolean(document.querySelector(".app-operation"))) &&' \
+            '(!Boolean(document.querySelector(".app-just-installed")));'
         if not browser.execute_script(script):
             time.sleep(0.1)
         elif browser.is_element_present_by_css('.neterror'):