Also fixes a problem on Mac Cocoa with not being able to use the close
editor button.

Reviewed-by: Lasse Holmstedt