Revert "Fix for appbar not closing"

This reverts commit b0d3d85d1e57879fe077d546a873873ca6a355c0.