Fixed strange behavior of Expand Button