diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php
index 802ec542f..5d3688427 100644
--- a/inc/poche/Poche.class.php
+++ b/inc/poche/Poche.class.php
@@ -430,6 +430,13 @@ class Poche
                 );
                 Tools::logm('config view');
                 break;
+            case 'edit-tags':
+                # tags
+                $tags = $this->store->retrieveTagsByEntry($id);
+                $tpl_vars = array(
+                    'tags' => $tags,
+                );
+                break;
             case 'tags':
                 $tags = $this->store->retrieveAllTags();
                 $tpl_vars = array(
diff --git a/inc/poche/Tools.class.php b/inc/poche/Tools.class.php
index 5bb65fe9a..9d9116990 100644
--- a/inc/poche/Tools.class.php
+++ b/inc/poche/Tools.class.php
@@ -106,6 +106,9 @@ class Tools
             case 'tags':
                 $tpl_file = 'tags.twig';
                 break;
+            case 'edit-tags':
+                $tpl_file = 'edit-tags.twig';
+                break;
             case 'view':
                 $tpl_file = 'view.twig';
                 break;
diff --git a/themes/default/edit-tags.twig b/themes/default/edit-tags.twig
new file mode 100644
index 000000000..0bd1aba7b
--- /dev/null
+++ b/themes/default/edit-tags.twig
@@ -0,0 +1,18 @@
+{% extends "layout.twig" %}
+{% block title %}edit tags{% endblock %}
+{% block menu %}
+{% include '_menu.twig' %}
+{% endblock %}
+{% block content %}
+{% if tags is empty %}
+no tags
+{% endif %}
+<ul>
+{% for tag in tags %}<li>{{ tag.value }} <a href="#">✘</a></li>{% endfor %}
+</ul>
+<form method="post" action="#">
+    <label for="value">New tags: </label><input type="text" id="value" name="value" required="required" />
+    {% trans "you can type several tags, separated by comma" %}<br />
+    <input type="submit" value="add tags" />
+</form>
+{% endblock %}
\ No newline at end of file
diff --git a/themes/default/view.twig b/themes/default/view.twig
index 5a7c9165d..9f9e23c81 100644
--- a/themes/default/view.twig
+++ b/themes/default/view.twig
@@ -21,7 +21,7 @@
                 <h1>{{ entry.title|raw }}</h1>
             </header>
             <aside class="tags">
-                tags: {% for tag in tags %}<a href="#">{{ tag.value }}</a> {% endfor %}<a href="#" title="{% trans "edit tags" %}">✎</a>
+                tags: {% for tag in tags %}<a href="#">{{ tag.value }}</a> {% endfor %}<a href="./?&amp;view=edit-tags&amp;id={{ entry.id|e }}" title="{% trans "edit tags" %}">✎</a>
             </aside>
             <article>
                 {{ content | raw }}