Fix: don't touch the item state unless disabling