Edit selects wrong block if personalized block before it

Description

Editing a block in a content area returns the wrong block if the blocks have personalization.

Steps to reproduce

1. In OPE mode, select a content area that list all blocks in that content area.
2. Personalize the first block on that list.
3. Edit the second block (after the personalized block).

Expected: Editing a block in a content area returns the correct block.
Actual: The wrong block is returned (It returns the first block).