fix setting of current_widget