diff --git a/src/includes/properties/class-papi-property.php b/src/includes/properties/class-papi-property.php
index <HASH>..<HASH> 100644
--- a/src/includes/properties/class-papi-property.php
+++ b/src/includes/properties/class-papi-property.php
@@ -52,6 +52,12 @@ class Papi_Property extends Papi_Core_Property {
 			$suffix = papi_underscorify( papi_slugify( $suffix ) );
 		}
 
+		$name = $this->html_name();
+
+		if ( $name[strlen( $name )-1] === ']' ) {
+			return sprintf( '_%s%s]', substr( $name, 0, strlen( $name )-1 ), $suffix );
+		}
+
 		return sprintf( '_%s%s', $this->html_name(), $suffix );
 	}
Add support for moving last ] when adding extra suffix