Handle collapsed selection
Adjust appearing of add button