IDEA-80056 better Enter fix