diff --git a/bottles/frontend/ui/bottle-row.blp b/bottles/frontend/ui/bottle-row.blp
index 2598ed52833..163900eab29 100644
--- a/bottles/frontend/ui/bottle-row.blp
+++ b/bottles/frontend/ui/bottle-row.blp
@@ -5,17 +5,13 @@ template $BottlesBottleRow: Adw.ActionRow {
   activatable: true;
   use-markup: false;
 
-  Box {
-    spacing: 6;
-
-    Label label_env {
-      valign: center;
+  Adw.WrapBox wrap_box {
+    valign: center;
 
-      styles [
-        "tag",
-        "caption",
-      ]
-    }
+    styles [
+      "tag",
+      "caption",
+    ]
   }
 
   Button button_run {
diff --git a/bottles/frontend/views/list.py b/bottles/frontend/views/list.py
index 54a717877e3..43ab9c226b4 100644
--- a/bottles/frontend/views/list.py
+++ b/bottles/frontend/views/list.py
@@ -37,7 +37,7 @@ class BottlesBottleRow(Adw.ActionRow):
 
     # region Widgets
     button_run = Gtk.Template.Child()
-    label_env = Gtk.Template.Child()
+    wrap_box = Gtk.Template.Child()
 
     # endregion
 
@@ -74,8 +74,8 @@ def __init__(self, window, config: BottleConfig, **kwargs):
         self.set_title(self.config.Name)
         if self.window.settings.get_boolean("update-date"):
             self.set_subtitle(update_date)
-        self.label_env.set_text(_(self.config.Environment))
-        self.label_env.add_css_class("tag-%s" % self.config.Environment.lower())
+
+        self.wrap_box.append(Gtk.Label.new(self.config.Environment))
 
         # Set tooltip text
         self.button_run.set_tooltip_text(_(f"Run executable in “{self.config.Name}”"))