added save state of toggle when grabbing another tool