diff --git a/ckan/controllers/tag.py b/ckan/controllers/tag.py
index bc45347db75..a736c17e8d0 100644
--- a/ckan/controllers/tag.py
+++ b/ckan/controllers/tag.py
@@ -1,5 +1,5 @@
 from pylons.i18n import _
-from pylons import request, c
+from pylons import request, c, config
 
 import ckan.logic as logic
 import ckan.model as model
@@ -65,4 +65,7 @@ def read(self, id):
         except logic.NotFound:
             base.abort(404, _('Tag not found'))
 
-        return base.render('tag/read.html')
+        if h.asbool(config.get('ckan.legacy_templates', False)):
+            return base.render('tag/read.html')
+        else:
+            h.redirect_to(controller='package', action='search', tags=c.tag.get('name'))
diff --git a/ckan/templates/tag/index.html b/ckan/templates/tag/index.html
new file mode 100644
index 00000000000..892345cec93
--- /dev/null
+++ b/ckan/templates/tag/index.html
@@ -0,0 +1,33 @@
+{% extends "page.html" %}
+
+{% block subtitle %}{{ _('Tags') }}{% endblock %}
+
+{% block breadcrumb_content %}
+  <li class="active"><a href="">{{ _('Tags') }}</a></li>
+{% endblock %}
+
+{% block primary_content %}
+  <article class="module">
+    <div class="module-content">
+      <h1 class="page-heading">{{ _('Tags') }}</h1>
+      <ul class="unstyled">
+        {% for tag in c.page.items %}
+          <li>{{ h.link_to(tag.display_name, h.url_for(controller='package', action='search', tags=tag.name), class_='tag') }}</li>
+        {% endfor %}
+      </ul>
+    </div>
+    {{ c.page.pager(q=c.q) }}
+  </article>
+{% endblock %}
+
+{% block secondary_content %}
+  <section class="module module-narrow module-shallow simple-input">
+    <form class="module-content field-bordered" action="{% url_for controller='tag', action='index' %}" method="get">
+      <div class="field">
+        <label for="field-tag-search">{{ _('Search') }}</label>
+        <input id="field-tag-search" type="text" class="field" name="q" placeholder="{{ _('Search') }}" />
+        <button class="btn-search" type="submit">{{ _('Search') }}</button>
+      </div>
+    </form>
+  </section>
+{% endblock %}