diff --git a/src/pretix/base/models/giftcards.py b/src/pretix/base/models/giftcards.py
index 9054697379..d076c60f5f 100644
--- a/src/pretix/base/models/giftcards.py
+++ b/src/pretix/base/models/giftcards.py
@@ -195,20 +195,21 @@ class GiftCardTransaction(models.Model):
                 return response
 
         if self.order_id:
-            if not self.text:
-                if not customer_facing:
-                    return format_html(
-                        '<a href="{}">{}</a>',
-                        reverse(
-                            "control:event.order",
-                            kwargs={
-                                "event": self.order.event.slug,
-                                "organizer": self.order.event.organizer.slug,
-                                "code": self.order.code,
-                            }
-                        ),
-                        self.order.full_code
-                    )
+            if not customer_facing:
+                return format_html(
+                    '<a href="{}">{}</a> {}',
+                    reverse(
+                        "control:event.order",
+                        kwargs={
+                            "event": self.order.event.slug,
+                            "organizer": self.order.event.organizer.slug,
+                            "code": self.order.code,
+                        }
+                    ),
+                    self.order.full_code,
+                    self.text or "",
+                )
+            elif not self.text:
                 return self.order.full_code
             else:
                 return self.text
diff --git a/src/pretix/base/payment.py b/src/pretix/base/payment.py
index b73fecd1a5..f7a8a5bcee 100644
--- a/src/pretix/base/payment.py
+++ b/src/pretix/base/payment.py
@@ -1627,6 +1627,7 @@ class GiftCardPayment(BasePaymentProvider):
             order=refund.order,
             refund=refund,
             acceptor=self.event.organizer,
+            text=refund.comment,
         )
         refund.info_data = {
             'gift_card': gc.pk,