[PATCH] Tooolbar in buffer change fix