[2.6.19] Undo/Keep buttons are overlayed instead of in breadcrumbs

This bug is critical because having the undo/keep buttons in the breadcrumbs is necessary to prevent this: