Fix <CreateButton>
keeps state between pages
#9407
Merged
<CreateButton>
keeps state between pages
#9407