Fix button visibility before collection