Semi-satisfactory fix to session expiring within popup actions