Ensure that the shelf being edited belongs to the active operator (bug 1105042)