For better or for worse, the QR is a dialog.
Some small fixes