diff --git a/templates/package.hamlet b/templates/package.hamlet
index d096a3b..5b848cb 100644
--- a/templates/package.hamlet
+++ b/templates/package.hamlet
@@ -23,7 +23,13 @@ $newline never
                         <a href="javascript:alert('Patience, preciouses!')">
                             #{tag}
                         , #
-                <i class="fa fa-plus-square" onclick="alert('TODO: Add tags.')"></i>
+                <i class="fa fa-plus-square" onclick="document.getElementById('add-tag-form').className = ''"></i>
+                <form #add-tag-form .hidden>
+                    <p>
+                        <strong>Add tag
+                    <div .input-append>
+                        <input type="text" id="new-tag">
+                        <button .btn>Add
             <div .social>
                 <span #likes>
                     #{formatNum 234}
diff --git a/templates/package.lucius b/templates/package.lucius
index 62c8f79..b5e4cd0 100644
--- a/templates/package.lucius
+++ b/templates/package.lucius
@@ -140,3 +140,7 @@ h2.changes-title {
 .readme-container {
   margin-top: 1em;
 }
+
+.hidden {
+  display: none;
+}