Either someone didn't stress enough that there are four basic flavors of the Fourier Transform, or they did introduce that for you but you've forgotten.
For a sampled-time signal of infinite extent in time, you should use the DTFT (not to be confused with the discrete Fourier transform, of which the FFT is the fast version).
The DTFT is defined as $$X(\omega) = \sum_{n-=\infty}^\infty x_n e^{-i \omega n}. \tag2$$
Note the infinite sum, not the finite sum of the DFT. Note also the fact that the $\omega$ on the left hand side is continuous, but it repeats every $2 \pi$ radians (this is a property of the four flavors of Fourier transform -- if the domain of one side is sampled, then the domain of the other side repeats every $2 \pi$ radians; if the domain of one side is continuous, then the domain of the other side has infinite extent.)
If you use (2) in calculating (1), then there's no adjustment needed -- things just work. Technically, this is the "proper" way to do it, but it's not amenable to doing things numerically.
When you use the DFT, then (1) holds, but with the wrinkle that $\mathbf x$ must now be a finite vector, and the convolution is now circular -- meaning that instead of defining
$$x_1(k) * x_2(\kappa) = \sum_{\kappa = -\infty}^\infty x_1(k - \kappa) x_2(\kappa) \tag3$$
you have
$$x_1(k) * x_2(\kappa) = \sum_{\kappa = 0}^{N-1} x_1((k - \kappa) \mod N) x_2(\kappa) \tag 4$$
The problem with (4) is that because of the modulo on $k - \kappa$, if the result would have been longer than $N$, you end up with a result as long as $N$, but with it's tail added into its head.
If you're going to use the FFT to speed up the convolution, then the only way to avoid that is to pad out $x_1$ and $x_2$ so that the inverse FFT is at least as long as the expected result of the convolution.