diff --git a/patterns/molecules/faq-list/js/faq-list.component.js b/patterns/molecules/faq-list/js/faq-list.component.js
index 22fac7f664f4bbb0b9939b2c055a7e06272cbb84..b044aef3b0e9265ba619eef5bf26fb5e55354841 100644
--- a/patterns/molecules/faq-list/js/faq-list.component.js
+++ b/patterns/molecules/faq-list/js/faq-list.component.js
@@ -4,23 +4,15 @@
 
     Drupal.behaviors.CERNComponentsFAQList = {
         attach: function (context) {
-
-			jQuery('body').once().on('click', '.collapseManager', function(){
-				if (jQuery(this).text() == '+') {
-					jQuery(this).text('-');
-					jQuery(this).css('top', 'auto');
-					jQuery(this).css('bottom', '-32px');
-					jQuery(this).css('font-size', '42px');
+            jQuery('.panel-title').once().on('click', function(){
+			    var link = jQuery(this).children('a');
+				if (link.hasClass("is-open")) {
+                    link.removeClass('is-open');
 				} else {
-					jQuery(this).text('+');
-					jQuery(this).css('top', '0');
-					jQuery(this).css('bottom', 'auto');
-					jQuery(this).css('font-size', '30px');
+                    link.addClass('is-open');
 				}
-				jQuery(this).closest('.faq-list-content-title').next('.faq-list-content-body').toggleClass('hidden');
 			});
-
         }  
     };
 
-})(jQuery, Drupal);    
\ No newline at end of file
+})(jQuery, Drupal);
\ No newline at end of file