Fix window opening + return button for the editor