Fix saving selected tool