#468 Last attempt to fix close button