diff --git a/rules-java/api/src/main/resources/reports/resources/js/windup-overview.js b/rules-java/api/src/main/resources/reports/resources/js/windup-overview.js
index <HASH>..<HASH> 100644
--- a/rules-java/api/src/main/resources/reports/resources/js/windup-overview.js
+++ b/rules-java/api/src/main/resources/reports/resources/js/windup-overview.js
@@ -13,7 +13,6 @@ $(document).on('click', '.panel-heading', function(e){
 		expandSelected(this);
 	}
 })
-$('#collapseAll').toggle();
 
 function expandSelected(e) {
 	var $this = $(e);
@@ -49,6 +48,7 @@ function expandMemory(){
 	});
 }
 
+
 //
 function expandAll(){
 	$('.panel-body').slideDown();
@@ -68,4 +68,13 @@ function collapseAll(){
 	$('#collapseAll').toggle();
 }
 
-expandMemory();
\ No newline at end of file
+expandMemory();
+
+// show properly the Collapse/Expand All link
+if ( $('.panel-heading').find('.glyphicon-chevron-up').length > 0) {
+   $('#collapseAll').toggle();
+}
+else {
+   $('#expandAll').toggle();
+}
+
WINDUP-<I> addition to the change to fix Expand/Collapse All links