Fixed close button behaviour