diff --git a/src/plainui/jinja2/plainui/assembly.html b/src/plainui/jinja2/plainui/assembly.html
index ac3efed590869b627d642430033dd131637ee8bd..1208c41f7004bddb26707a42c767d74810e8c473 100644
--- a/src/plainui/jinja2/plainui/assembly.html
+++ b/src/plainui/jinja2/plainui/assembly.html
@@ -118,7 +118,7 @@
 
     <hr class="hub-spacer">
 
-    {{ tagboxMacro.tagbox(tags) }}
+    {{ tagboxMacro.tagbox(tags, edit_url=url('backoffice:assembly-edit', pk=assembly.id)+'#tags') }}
 
     <hr class="hub-spacer">
 
diff --git a/src/plainui/jinja2/plainui/components/tagbox.html b/src/plainui/jinja2/plainui/components/tagbox.html
index f7c00d0b076b8f3152874b3d067df518ffef4169..54019b289e15fed6258860873e175aee4f825cc3 100644
--- a/src/plainui/jinja2/plainui/components/tagbox.html
+++ b/src/plainui/jinja2/plainui/components/tagbox.html
@@ -1,6 +1,12 @@
-{% macro tagbox(tags) -%}
-<div>
-    <h2 class="bg-secondary text-center text-dark m-0 px-3 py-1">{{_("Tags")}}</h2>
+{% macro tagbox(tags, edit_url) -%}
+<div id="tags">
+    <div class="bg-secondary text-dark px-3 py-1 d-flex gap-2 align-items-center">
+        <h2 class="text-center m-0 me-auto">{{_("Tags")}}</h2>
+        {% if edit_url %}
+        <a title="Edit tags" href="{{ edit_url }}" class="btn btn-sm btn-primary"><i class="bi bi-pencil-square"></i></a>
+        {% endif %}
+    </div>
+
     {% if tags %}
         <ul class="px-3 flex-grow-1 pt-3 pb-2 list-unstyled mb-0 d-flex flex-row flex-wrap  align-items-center">
             {%- for tag in tags %}