Case #4116 - Make expand/collapse arrows work