diff --git a/src/freedombone-utils-webadmin b/src/freedombone-utils-webadmin
index 48009aaa8e95fd62ee443ad1b08edb0a35ec3a44..557b6302b327b2c03d36c6336198f9a3ae01ab33 100755
--- a/src/freedombone-utils-webadmin
+++ b/src/freedombone-utils-webadmin
@@ -190,9 +190,11 @@ function web_admin_create_add_apps {
         done
 
         # check if the app is pending installation
+        app_pending_install=
         if [ -f "$pending_installs" ]; then
             if grep -q "install_${app_name}" "$pending_installs"; then
                 app_is_installed=1
+                app_pending_install=1
             fi
         fi
 
@@ -235,14 +237,23 @@ function web_admin_create_add_apps {
 
                 filename="/var/www/${local_hostname}/htdocs/admin/app_add_${app_name}.html"
 
-                { echo '      <div class="column">';
-                  echo '        <div>';
-                  echo "          <a href=\"app_add_${app_name}.html\">";
-                  echo "            <img src=\"icons/${app_name}.png\" style=\"width:100%\">";
-                  echo "            <center>${app_name}</center>";
-                  echo '          </a>';
-                  echo '        </div>';
-                  echo '      </div>'; } >> "$appslist_add_filename"
+                if [ ! $app_pending_install ]; then
+                    { echo '      <div class="column">';
+                      echo '        <div>';
+                      echo "          <a href=\"app_add_${app_name}.html\">";
+                      echo "            <img src=\"icons/${app_name}.png\" style=\"width:100%\">";
+                      echo "            <center>${app_name}</center>";
+                      echo '          </a>';
+                      echo '        </div>';
+                      echo '      </div>'; } >> "$appslist_add_filename"
+                else
+                    { echo '      <div class="column">';
+                      echo '        <div>';
+                      echo "        <img src=\"icons/${app_name}.png\" style=\"width:100%\">";
+                      echo "        <center class=\"installing\">${app_name}</center>";
+                      echo '        </div>';
+                      echo '      </div>'; } >> "$appslist_add_filename"
+                fi
 
                 cp "$app_add_template_filename" "$filename"
 
diff --git a/webadmin/EN/apps_add_template.html b/webadmin/EN/apps_add_template.html
index 111e0c678bf7fa8f1b461e42d211b5989e2e073b..d80a0b5540e3e27758e824f65224838e32093266 100644
--- a/webadmin/EN/apps_add_template.html
+++ b/webadmin/EN/apps_add_template.html
@@ -56,6 +56,11 @@
           vertical-align: middle;
       }
 
+      .installing {
+          opacity: 0.5;
+          font-weight: bold;
+      }
+
       @media screen and (max-width: 800px) {
           .column {
               -ms-flex: 50%;