Test and fix contextual wiidget restore