Applying the [#42743235] fix to our main 'barz' branch in the barz/QuickDialog fork.