Options click not closing it
Merge commit 'f0e55caa476ad3c1d39debb2a07064f7257f29d1'