diff --git a/js/acf4_repeater_collapser_admin.js b/js/acf4_repeater_collapser_admin.js
index 07a6d88..a9b0701 100644
--- a/js/acf4_repeater_collapser_admin.js
+++ b/js/acf4_repeater_collapser_admin.js
@@ -11,6 +11,10 @@ jQuery(document).ready(function($) {
 			$collapseSingleButtonTable = '<td class="repeater-button-cell"><div class="repeater-button-cell-div"><button type="button" role="button" class="button field-repeater-toggle field-repeater-toggle-single"><span class="screen-reader-text">' + acfrcL10n.collapseRow + '</span></button></div></td>',
 			$collapseSingleButton = '<button type="button" role="button" class="button field-repeater-toggle field-repeater-toggle-single"><span class="screen-reader-text">' + acfrcL10n.collapseRow + '</span></button>';
 
+			// Collapse all fields by default
+			acfRepeaterToggleAll();
+
+
 		// find each repeater & flexible instance, add the button if the field uses the row layout
 		$('.field_type-repeater, .field_type-flexible_content').each( function() {
 			var	$repeater = $(this);
@@ -137,6 +141,13 @@ jQuery(document).ready(function($) {
 			$rowsetButton  = $that,
 			$rowsetWrapper = $that.parent();
 
+			if ($rowsetWrapper.length == 0) {
+				$rowsetWrapper = $('.field_type-repeater');
+			}
+			else {
+				$rowsetWrapper = $that.parent();
+			}
+
 		// select either nested or unnested repeater rows, not both
 		if( true === $rowsetWrapper.data('acf-repeater-nested') ) {
 			$rows = $('.row:data(acf-repeater-nested),.layout', $rowsetWrapper);
@@ -154,7 +165,9 @@ jQuery(document).ready(function($) {
 		}
 
 		// prevent bubbling up to parent repeater rowset
-		event.stopPropagation();
+		if (event) {
+			event.stopPropagation();
+		}
 	}
 
 	/**
@@ -187,7 +200,9 @@ jQuery(document).ready(function($) {
 		}
 
 		// prevent bubbling up to parent row button
-		event.stopPropagation();
+		if (event) {
+			event.stopPropagation();
+		}
 	}
 
 	/**
diff --git a/js/acf5_repeater_collapser_admin.js b/js/acf5_repeater_collapser_admin.js
index dcd6698..377e04f 100644
--- a/js/acf5_repeater_collapser_admin.js
+++ b/js/acf5_repeater_collapser_admin.js
@@ -11,6 +11,9 @@ jQuery(document).ready(function($) {
 			$collapseSingleButtonTable = '<td class="repeater-button-cell"><div class="repeater-button-cell-div"><button type="button" role="button" class="button field-repeater-toggle field-repeater-toggle-single"><span class="screen-reader-text">' + acfrcL10n.collapseRow + '</span></button></div></td>',
 			$collapseSingleButton = '<button type="button" role="button" class="button field-repeater-toggle field-repeater-toggle-single"><span class="screen-reader-text">' + acfrcL10n.collapseRow + '</span></button>';
 
+			// Collapse all fields by default
+			acfRepeaterToggleAll();
+			
 		// find each repeater & flexible instance, add the button if the field uses the row layout
 		$('.field_type-repeater, .field_type-flexible_content').each( function() {
 			var $repeater = $(this);
@@ -143,6 +146,13 @@ jQuery(document).ready(function($) {
 			$rowsetButton  = $that,
 			$rowsetWrapper = $that.closest('.acf-field');
 
+			if ($rowsetWrapper.length == 0) {
+				$rowsetWrapper = $('.field_type-repeater');
+			}
+			else {
+				$rowsetWrapper = $that.parent();
+			}
+
 		// select either nested or unnested repeater rows, not both
 		if( true === $rowsetWrapper.data('acf-repeater-nested') ) {
 			$rows = $('.acf-row:data(acf-repeater-nested),.layout', $rowsetWrapper);
@@ -160,7 +170,9 @@ jQuery(document).ready(function($) {
 		}
 
 		// prevent bubbling up to parent repeater rowset
-		event.stopPropagation();
+		if (event) {
+            event.stopPropagation();
+        }
 	}
 
 	/**
@@ -186,7 +198,9 @@ jQuery(document).ready(function($) {
 		}
 
 		// prevent bubbling up to parent row button
-		event.stopPropagation();
+		if (event) {
+			event.stopPropagation();
+		}
 	}
 
 	/**