diff --git a/projects/dsp-ui/src/lib/action/pipes/string-transformation/linkify.pipe.spec.ts b/projects/dsp-ui/src/lib/action/pipes/string-transformation/linkify.pipe.spec.ts
index 71b052fe8..076aa328d 100644
--- a/projects/dsp-ui/src/lib/action/pipes/string-transformation/linkify.pipe.spec.ts
+++ b/projects/dsp-ui/src/lib/action/pipes/string-transformation/linkify.pipe.spec.ts
@@ -29,4 +29,10 @@ describe('LinkifyPipe', () => {
         const linkifiedSnippet = pipe.transform(text);
         expect(linkifiedSnippet).toEqual('You can visit the app on <a href="https://app.dasch.swiss" target="_blank">https://app.dasch.swiss</a> and the documentation on <a href="http://docs.dasch.swiss" target="_blank">docs.dasch.swiss</a>.');
     });
+
+    it('should keep the spaces after a full stop or after a comma', () => {
+        const text = 'This is just a title. And it could have an URL, but it doesn\'t have one. ';
+        const linkifiedSnippet = pipe.transform(text);
+        expect(linkifiedSnippet).toEqual('This is just a title. And it could have an URL, but it doesn\'t have one.');
+    });
 });
diff --git a/projects/dsp-ui/src/lib/action/pipes/string-transformation/linkify.pipe.ts b/projects/dsp-ui/src/lib/action/pipes/string-transformation/linkify.pipe.ts
index 4c862f026..dad8ff8aa 100644
--- a/projects/dsp-ui/src/lib/action/pipes/string-transformation/linkify.pipe.ts
+++ b/projects/dsp-ui/src/lib/action/pipes/string-transformation/linkify.pipe.ts
@@ -19,7 +19,7 @@ export class LinkifyPipe implements PipeTransform {
                 let end = ' ';
                 if (endsWithFullStop) {
                     str = str.slice(0, -1);
-                    end = '.'
+                    end = lastChar + ' ';
                 }
                 if (this._recognizeUrl(str)) {
                     const url = this._setProtocol(str);