diff --git a/js/jquery.mobile.controlGroup.js b/js/jquery.mobile.controlGroup.js
index 97f324e6..7efbadec 100644
--- a/js/jquery.mobile.controlGroup.js
+++ b/js/jquery.mobile.controlGroup.js
@@ -32,7 +32,7 @@ $.fn.controlgroup = function(options){
 				.end()
 				.filter(':last').addClass(flCorners[1]).addClass('ui-controlgroup-last');
 		}
-		flipClasses($(this).find('.ui-btn'));
+		flipClasses($(this).find('.ui-btn'+(o.dontFilterOutInvisible?'':':visible')));
 		flipClasses($(this).find('.ui-btn-inner'));
 		if(o.shadow){
 			$(this).addClass('ui-shadow');
diff --git a/js/jquery.mobile.page.js b/js/jquery.mobile.page.js
index 461e5152..3f4e6f25 100644
--- a/js/jquery.mobile.page.js
+++ b/js/jquery.mobile.page.js
@@ -134,7 +134,7 @@ $.widget( "mobile.page", $.mobile.widget, {
 
 		$elem
 			.find(":jqmData(role='controlgroup')")
-			.controlgroup();
+			.controlgroup({dontFilterOutInvisible: true});
 
 		//links within content areas
 		$elem.find( "a:not(.ui-btn):not(.ui-link-inherit)" )