diff --git a/digimarks.py b/digimarks.py
index 4f60f23..b07d048 100644
--- a/digimarks.py
+++ b/digimarks.py
@@ -516,6 +516,14 @@ def addpublictag(userkey, tag):
         return redirect(url_for('tag', userkey=userkey, tag=tag, message=message))
 
 
+@app.route('/<userkey>/<tag>/removepublic/<tagkey>', methods=['GET', 'POST'])
+def removepublictag(userkey, tag, tagkey):
+    q = PublicTag.delete().where(PublicTag.userkey == userkey, PublicTag.tag == tag, PublicTag.tagkey == tagkey)
+    q.execute()
+    message = 'Public link deleted'
+    return redirect(url_for('tag', userkey=userkey, tag=tag, message=message))
+
+
 @app.route('/<systemkey>/adduser')
 def adduser(systemkey):
     """ Add user endpoint, convenience """
diff --git a/templates/tags.html b/templates/tags.html
index ff89cdc..409b0be 100644
--- a/templates/tags.html
+++ b/templates/tags.html
@@ -21,9 +21,9 @@
                 </td>
                 <td>
                     {% if tag['publictag'] %}
-                        <a href="{{ url_for('publictag', tagkey=tag['publictag'].tagkey) }}">Public link</a>
+                        <a href="{{ url_for('publictag', tagkey=tag['publictag'].tagkey) }}">Public link</a> (<a href="{{ url_for('removepublictag', tag=tag['tag'], tagkey=tag['publictag'].tagkey, userkey=userkey) }}">Delete</a> <i class="tiny material-icons red-text">warning</i>)
                     {% else %}
-                        -
+                        <a href="{{ url_for('addpublictag', userkey=userkey, tag=tag['tag']) }}">Create</a>
                     {% endif %}
                 </td>
                 <td>