HOT FIX: Changing object controls top-bar