SSP-2485 Fix collapse issue with tabbed layout