Make broken middle click during refactor work again

Change-Id: Ie4c40accd1ac21c548d4ab899ffdd6c8f95af0a5