diff --git a/inc/poche/Database.class.php b/inc/poche/Database.class.php
index 86907e528..8e9ee0b7e 100644
--- a/inc/poche/Database.class.php
+++ b/inc/poche/Database.class.php
@@ -250,13 +250,21 @@ class Database {
         return $this->getHandle()->lastInsertId($column);
     }
 
+    public function retrieveAllTags() {
+        $sql = "SELECT * FROM tags";
+        $query = $this->executeQuery($sql, array());
+        $tags = $query->fetchAll();
+
+        return $tags;
+    }
+
     public function retrieveTagsByEntry($entry_id) {
-        $sql        = 
+        $sql = 
             "SELECT * FROM tags
             LEFT JOIN tags_entries ON tags_entries.tag_id=tags.id
             WHERE tags_entries.entry_id = ?";
-        $query      = $this->executeQuery($sql, array($entry_id));
-        $tags    = $query->fetchAll();
+        $query = $this->executeQuery($sql, array($entry_id));
+        $tags = $query->fetchAll();
 
         return $tags;
     }
diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php
index c9fb6382f..802ec542f 100644
--- a/inc/poche/Poche.class.php
+++ b/inc/poche/Poche.class.php
@@ -430,6 +430,12 @@ class Poche
                 );
                 Tools::logm('config view');
                 break;
+            case 'tags':
+                $tags = $this->store->retrieveAllTags();
+                $tpl_vars = array(
+                    'tags' => $tags,
+                );
+                break;
             case 'view':
                 $entry = $this->store->retrieveOneById($id, $this->user->getId());
                 if ($entry != NULL) {
diff --git a/inc/poche/Tools.class.php b/inc/poche/Tools.class.php
index 750553f12..5bb65fe9a 100644
--- a/inc/poche/Tools.class.php
+++ b/inc/poche/Tools.class.php
@@ -103,14 +103,15 @@ class Tools
             case 'config':
                 $tpl_file = 'config.twig';
                 break;
+            case 'tags':
+                $tpl_file = 'tags.twig';
+                break;
             case 'view':
                 $tpl_file = 'view.twig';
                 break;
-            
             case 'login':
                 $tpl_file = 'login.twig';
                 break;
-                
             case 'error':
                 $tpl_file = 'error.twig';
                 break;
diff --git a/themes/default/_menu.twig b/themes/default/_menu.twig
index 699d6a0c9..02bec1dcd 100644
--- a/themes/default/_menu.twig
+++ b/themes/default/_menu.twig
@@ -2,6 +2,7 @@
                 <li><a href="./" {% if view == 'home' %}class="current"{% endif %}>{% trans "home" %}</a></li>
                 <li><a href="./?view=fav" {% if view == 'fav' %}class="current"{% endif %}>{% trans "favorites" %}</a></li>
                 <li><a href="./?view=archive" {% if view == 'archive' %}class="current"{% endif %}>{% trans "archive" %}</a></li>
+                <li><a href="./?view=tags" {% if view == 'tags' %}class="current"{% endif %}>{% trans "tags" %}</a></li>
                 <li><a href="./?view=config" {% if view == 'config' %}class="current"{% endif %}>{% trans "config" %}</a></li>
                 <li><a href="./?logout" title="{% trans "logout" %}">{% trans "logout" %}</a></li>
             </ul>
\ No newline at end of file
diff --git a/themes/default/tags.twig b/themes/default/tags.twig
new file mode 100644
index 000000000..9421fe3ea
--- /dev/null
+++ b/themes/default/tags.twig
@@ -0,0 +1,8 @@
+{% extends "layout.twig" %}
+{% block title %}tags{% endblock %}
+{% block menu %}
+{% include '_menu.twig' %}
+{% endblock %}
+{% block content %}
+{% for tag in tags %}<a href="#">{{ tag.value }}</a> {% endfor %}
+{% endblock %}
\ No newline at end of file