Fix builder focus toggling