diff --git a/layouts/joomla/html/formbehavior/chosen.php b/layouts/joomla/html/formbehavior/chosen.php
index 71f14519e5407..3c35941512a49 100644
--- a/layouts/joomla/html/formbehavior/chosen.php
+++ b/layouts/joomla/html/formbehavior/chosen.php
@@ -28,11 +28,17 @@
 // Options array to json options string
 $options_str = json_encode($options, ($debug && defined('JSON_PRETTY_PRINT') ? JSON_PRETTY_PRINT : false));
 
-
 JFactory::getDocument()->addScriptDeclaration(
-	"
-		jQuery(document).ready(function (){
-			jQuery('" . $selector . "').chosen(" . $options_str . ");
-		});
-	"
-);
\ No newline at end of file
+	'
+	jQuery(function ($) {
+		initChosen();
+		$("body").on("subform-row-add", initChosen);
+
+		function initChosen(event, container)
+		{
+			container = container || document;
+			$(container).find(' . json_encode($selector) . ').chosen(' . $options_str . ');
+		}
+	});
+	'
+);
diff --git a/media/system/js/subform-repeatable-uncompressed.js b/media/system/js/subform-repeatable-uncompressed.js
index a778652b1c2fb..13eafb112a74b 100644
--- a/media/system/js/subform-repeatable-uncompressed.js
+++ b/media/system/js/subform-repeatable-uncompressed.js
@@ -226,11 +226,6 @@
 	// method for hack the scripts that can be related
 	// to the one of field that in given $row
 	$.subformRepeatable.prototype.fixScripts = function($row){
-		// init chosen if any
-		if($.fn.chosen){
-			$row.find('select.advancedSelect').chosen();
-		}
-
 		//color picker
 		$row.find('.minicolors').each(function() {
 			var $el = $(this);
diff --git a/media/system/js/subform-repeatable.js b/media/system/js/subform-repeatable.js
index a5f1ab8a7191f..78f1be6628a68 100644
--- a/media/system/js/subform-repeatable.js
+++ b/media/system/js/subform-repeatable.js
@@ -1 +1,2 @@
-(function(e){"use strict";e.subformRepeatable=function(t,n){this.$container=e(t);if(this.$container.data("subformRepeatable"))return r;this.$container.data("subformRepeatable",r),this.options=e.extend({},e.subformRepeatable.defaults,n),this.template="",this.prepareTemplate(),this.$containerRows=this.options.rowsContainer?this.$container.find(this.options.rowsContainer):this.$container,this.lastRowNum=this.$containerRows.find(this.options.repeatableElement).length;var r=this;this.$container.on("click",this.options.btAdd,function(t){t.preventDefault();var n=e(this).parents(r.options.repeatableElement);n.length||(n=null),r.addRow(n)}),this.$container.on("click",this.options.btRemove,function(t){t.preventDefault();var n=e(this).parents(r.options.repeatableElement);r.removeRow(n)}),this.options.btMove&&this.$containerRows.sortable({items:this.options.repeatableElement,handle:this.options.btMove,tolerance:"pointer"}),this.$container.trigger("subform-ready")},e.subformRepeatable.prototype.prepareTemplate=function(){if(this.options.rowTemplateSelector){var t=this.$container.find(this.options.rowTemplateSelector)[0]||{};this.template=e.trim(t.text||t.textContent)}else{var n=this.$container.find(this.options.repeatableElement).get(0),r=e(n).clone();try{this.clearScripts(r)}catch(i){window.console&&console.log(i)}this.template=r.prop("outerHTML")}},e.subformRepeatable.prototype.addRow=function(t){var n=this.$containerRows.find(this.options.repeatableElement).length;if(n>=this.options.maximum)return null;var r=e.parseHTML(this.template);t?e(t).after(r):this.$containerRows.append(r);var i=e(r);i.attr("data-new","true"),this.fixUniqueAttributes(i,n);try{this.fixScripts(i)}catch(s){window.console&&console.log(s)}return this.$container.trigger("subform-row-add",i),i},e.subformRepeatable.prototype.removeRow=function(e){var t=this.$containerRows.find(this.options.repeatableElement).length;if(t<=this.options.minimum)return;this.$container.trigger("subform-row-remove",e),e.remove()},e.subformRepeatable.prototype.fixUniqueAttributes=function(t,n){this.lastRowNum++;var r=t.attr("data-group"),i=t.attr("data-base-name"),n=n||0,s=Math.max(this.lastRowNum,n+1),o=i+s;this.lastRowNum=s,t.attr("data-group",o);var u=t.find("*[name]"),a={};for(var f=0,l=u.length;f<l;f++){var c=e(u[f]),h=c.attr("name"),p=h.replace(/(\]|\[\]$)/g,"").replace(/\[/g,"_"),d=h.replace("["+r+"][","["+o+"]["),v=p.replace(r,o),m=p;if(c.prop("type")==="checkbox"){if(h.match(/\[\]$/)){var g=t.find('label[for="'+p+'"]');g.length&&(g.attr("for",v),c.parents("fieldset.checkboxes").attr("id",v));var n=a[p]?a[p].length:0;m+=n,v+=n}}else if(c.prop("type")==="radio"){var n=a[p]?a[p].length:0;m+=n,v+=n}a[p]?a[p].push(!0):a[p]=[!0],c.attr("name",d),c.attr("id",v),t.find('label[for="'+m+'"]').attr("for",v)}},e.subformRepeatable.prototype.clearScripts=function(t){e.fn.chosen&&t.find("select.chzn-done").each(function(){var t=e(this);t.next(".chzn-container").remove(),t.show().addClass("fix-chosen")}),e.fn.minicolors&&(t.find(".minicolors input").each(function(){e(this).minicolors('destroy', e(this));}))},e.subformRepeatable.prototype.fixScripts=function(t){e.fn.chosen&&t.find("select.advancedSelect").chosen(),t.find(".minicolors").each(function(){var t=e(this);t.minicolors({control:t.attr("data-control")||"hue",position:t.attr("data-position")||"right",theme:"bootstrap"})}),t.find('a[onclick*="jInsertFieldValue"]').each(function(){var t=e(this),n=t.siblings('input[type="text"]').attr("id"),r=t.prev(),i=r.attr("href");t.attr("onclick","jInsertFieldValue('', '"+n+"');return false;"),r.attr("href",i.replace(/&fieldid=(.+)&/,"&fieldid="+n+"&"))}),e.fn.fieldMedia&&t.find(".field-media-wrapper").fieldMedia(),e.fn.tooltip&&t.find(".hasTooltip").tooltip({html:!0,container:"body"}),e.fn.fieldUser&&t.find(".field-user-wrapper").fieldUser(),window.SqueezeBox&&window.SqueezeBox.assign&&SqueezeBox.assign(t.find("a.modal").get(),{parse:"rel"})},e.subformRepeatable.defaults={btAdd:".group-add",btRemove:".group-remove",btMove:".group-move",minimum:0,maximum:10,repeatableElement:".subform-repeatable-group",rowTemplateSelector:"script.subform-repeatable-template-section",rowsContainer:null},e.fn.subformRepeatable=function(t){return this.each(function(){var t=t||{},n=e(this).data();if(n.subformRepeatable)return;for(var r in n)n.hasOwnProperty(r)&&(t[r]=n[r]);var i=new e.subformRepeatable(this,t);e(this).data("subformRepeatable",i)})},e(window).on("load",function(){e("div.subform-repeatable").subformRepeatable()})})(jQuery);
\ No newline at end of file
+!(function(t){"use strict";t.subformRepeatable=function(e,o){if(this.$container=t(e),this.$container.data("subformRepeatable"))return i;this.$container.data("subformRepeatable",i),this.options=t.extend({},t.subformRepeatable.defaults,o),this.template="",this.prepareTemplate(),this.$containerRows=this.options.rowsContainer?this.$container.find(this.options.rowsContainer):this.$container,this.lastRowNum=this.$containerRows.find(this.options.repeatableElement).length;var i=this;this.$container.on("click",this.options.btAdd,(function(e){e.preventDefault();var o=t(this).parents(i.options.repeatableElement);o.length||(o=null),i.addRow(o)})),this.$container.on("click",this.options.btRemove,(function(e){e.preventDefault();var o=t(this).parents(i.options.repeatableElement);i.removeRow(o)})),this.options.btMove&&this.$containerRows.sortable({items:this.options.repeatableElement,handle:this.options.btMove,tolerance:"pointer"}),this.$container.trigger("subform-ready")},t.subformRepeatable.prototype.prepareTemplate=function(){if(this.options.rowTemplateSelector){var e=this.$container.find(this.options.rowTemplateSelector)[0]||{};this.template=t.trim(e.text||e.textContent)}else{var o=this.$container.find(this.options.repeatableElement).get(0),i=t(o).clone();try{this.clearScripts(i)}catch(t){window.console&&console.log(t)}this.template=i.prop("outerHTML")}},t.subformRepeatable.prototype.addRow=function(e){var o=this.$containerRows.find(this.options.repeatableElement).length;if(o>=this.options.maximum)return null;var i=t.parseHTML(this.template);e?t(e).after(i):this.$containerRows.append(i);var a=t(i);a.attr("data-new","true"),this.fixUniqueAttributes(a,o);try{this.fixScripts(a)}catch(t){window.console&&console.log(t)}return this.$container.trigger("subform-row-add",a),a},t.subformRepeatable.prototype.removeRow=function(t){var e=this.$containerRows.find(this.options.repeatableElement).length;e<=this.options.minimum||(this.$container.trigger("subform-row-remove",t),t.remove())},t.subformRepeatable.prototype.fixUniqueAttributes=function(e,o){this.lastRowNum++;var i=e.attr("data-group"),a=e.attr("data-base-name"),o=o||0,r=Math.max(this.lastRowNum,o+1),n=a+r;this.lastRowNum=r,e.attr("data-group",n);for(var s=e.find("*[name]"),l={},p=0,f=s.length;p<f;p++){var c=t(s[p]),h=c.attr("name"),u=h.replace(/(\]|\[\]$)/g,"").replace(/\[/g,"_"),m=h.replace("["+i+"][","["+n+"]["),d=u.replace(i,n),b=u;if("checkbox"===c.prop("type")){if(h.match(/\[\]$/)){var w=e.find('label[for="'+u+'"]');w.length&&(w.attr("for",d),c.parents("fieldset.checkboxes").attr("id",d));var o=l[u]?l[u].length:0;b+=o,d+=o}}else if("radio"===c.prop("type")){var o=l[u]?l[u].length:0;b+=o,d+=o}l[u]?l[u].push(!0):l[u]=[!0],c.attr("name",m),c.attr("id",d),e.find('label[for="'+b+'"]').attr("for",d)}},t.subformRepeatable.prototype.clearScripts=function(e){t.fn.chosen&&e.find("select.chzn-done").each((function(){var e=t(this);e.next(".chzn-container").remove(),e.show().addClass("fix-chosen")})),t.fn.minicolors&&e.find(".minicolors input").each((function(){t(this).minicolors("destroy",t(this))}))},t.subformRepeatable.prototype.fixScripts=function(e){e.find(".minicolors").each((function(){var e=t(this);e.minicolors({control:e.attr("data-control")||"hue",position:e.attr("data-position")||"right",theme:"bootstrap"})})),e.find('a[onclick*="jInsertFieldValue"]').each((function(){var e=t(this),o=e.siblings('input[type="text"]').attr("id"),i=e.prev(),a=i.attr("href");e.attr("onclick","jInsertFieldValue('', '"+o+"');return false;"),i.attr("href",a.replace(/&fieldid=(.+)&/,"&fieldid="+o+"&"))})),t.fn.fieldMedia&&e.find(".field-media-wrapper").fieldMedia(),t.fn.tooltip&&e.find(".hasTooltip").tooltip({html:!0,container:"body"}),t.fn.fieldUser&&e.find(".field-user-wrapper").fieldUser(),window.SqueezeBox&&window.SqueezeBox.assign&&SqueezeBox.assign(e.find("a.modal").get(),{parse:"rel"})},t.subformRepeatable.defaults={btAdd:".group-add",btRemove:".group-remove",btMove:".group-move",minimum:0,maximum:10,repeatableElement:".subform-repeatable-group",rowTemplateSelector:"script.subform-repeatable-template-section",rowsContainer:null},t.fn.subformRepeatable=function(e){return this.each((function(){var e=e||{},o=t(this).data();if(!o.subformRepeatable){for(var i in o)o.hasOwnProperty(i)&&(e[i]=o[i]);var a=new t.subformRepeatable(this,e);t(this).data("subformRepeatable",a)}}))},t(window).on("load",(function(){t("div.subform-repeatable").subformRepeatable()}))})(jQuery);
+
diff --git a/tests/unit/suites/libraries/cms/html/JHtmlFormbehaviorTest.php b/tests/unit/suites/libraries/cms/html/JHtmlFormbehaviorTest.php
index a231ee34e15c6..fb503608fd69d 100644
--- a/tests/unit/suites/libraries/cms/html/JHtmlFormbehaviorTest.php
+++ b/tests/unit/suites/libraries/cms/html/JHtmlFormbehaviorTest.php
@@ -100,7 +100,7 @@ public function testChosen()
 		);
 
 		$this->assertContains(
-			"jQuery('testSelect').chosen",
+			'$(container).find("testSelect").chosen',
 			$document->_script['text/javascript'],
 			'Verify that the Chosen JS is initialised with the supplied selector'
 		);