diff --git a/src/jquery.formset.js b/src/jquery.formset.js
index a47d9c0..737d1e7 100644
--- a/src/jquery.formset.js
+++ b/src/jquery.formset.js
@@ -72,9 +72,9 @@
                         row.hide();
                         forms = $('.' + options.formCssClass).not(':hidden');
                     } else {
-                        row.remove();
                         // Update the TOTAL_FORMS count:
-                        forms = $('.' + options.formCssClass).not('.formset-custom-template');
+                        forms = row.parent().find('.' + options.formCssClass + ':not(\'.formset-custom-template\')');
+                        row.remove();
                         totalForms.val(forms.length);
                     }
                     for (var i=0, formCount=forms.length; i<formCount; i++) {