[Workspace Model] [IDEA-253589] Use the same approach for resolving short windows...