#21126 - Updated qt widget management to be more robust