diff --git a/applications/admin/static/js/web2py.js b/applications/admin/static/js/web2py.js
index 7853e8cb..7b9d9802 100644
--- a/applications/admin/static/js/web2py.js
+++ b/applications/admin/static/js/web2py.js
@@ -338,6 +338,7 @@
                         web2py.trap_form(action, target);
                         web2py.ajax_init('#' + target);
                         web2py.after_ajax(xhr);
+                        web2py.fire(element, 'w2p:componentComplete', [xhr, status], target); // Let us know the component is finished loading
                     }
                 });
             }
diff --git a/applications/examples/static/js/web2py.js b/applications/examples/static/js/web2py.js
index 7853e8cb..7b9d9802 100644
--- a/applications/examples/static/js/web2py.js
+++ b/applications/examples/static/js/web2py.js
@@ -338,6 +338,7 @@
                         web2py.trap_form(action, target);
                         web2py.ajax_init('#' + target);
                         web2py.after_ajax(xhr);
+                        web2py.fire(element, 'w2p:componentComplete', [xhr, status], target); // Let us know the component is finished loading
                     }
                 });
             }
diff --git a/applications/welcome/static/js/web2py.js b/applications/welcome/static/js/web2py.js
index 7853e8cb..7b9d9802 100644
--- a/applications/welcome/static/js/web2py.js
+++ b/applications/welcome/static/js/web2py.js
@@ -338,6 +338,7 @@
                         web2py.trap_form(action, target);
                         web2py.ajax_init('#' + target);
                         web2py.after_ajax(xhr);
+                        web2py.fire(element, 'w2p:componentComplete', [xhr, status], target); // Let us know the component is finished loading
                     }
                 });
             }