Fix popup issues [43]
Backport of a crash fix from !2940 (merged). The other two commits from that MR fix bugs relating to transactions and therefore don't need a backport.
Backport of a crash fix from !2940 (merged). The other two commits from that MR fix bugs relating to transactions and therefore don't need a backport.