Fixed leaking textfield in page header
Merge branch 'fix-leaking-textfield' into develop