Fixes #5824 

Fixes #5824 by ensuring consistent ready button placement.