diff --git a/soundboard.py b/soundboard.py
index 00e8237..8d789fc 100644
--- a/soundboard.py
+++ b/soundboard.py
@@ -178,3 +178,21 @@ WHERE button.id IN (
 	sounds = queryDB(query, tags.split(","))
 
 	return jsonify([sound["file"].split(".")[0] for sound in sounds])
+
+@app.route("/tags/add/", methods=["GET", "POST"])
+def tags_add():
+	if request.method == "POST":
+		if not request.form.get("cancel") and request.form.get("tag") is not None:
+			queryDB("INSERT OR REPLACE INTO tag (name) VALUES (?)", (request.form.get("tag"),))
+			getDB().commit()
+
+		return redirect("/edit")
+
+	return render_template("tags_add.html")
+
+@app.route("/tags/delete/<path:name>")
+def tags_delete(name):
+	queryDB("DELETE FROM tag WHERE name = ?", (name,))
+	getDB().commit()
+
+	return redirect("/edit")
diff --git a/templates/index.html b/templates/index.html
index 168cc9f..751c268 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -47,8 +47,9 @@
 					<div id="reset">✕</div>
 					<ul class="tags">
 					{% for tag in tags %}
-						<li><a href="#" tabindex="-1">{{ tag.name }}</a></li>
+						<li><a href="#" tabindex="-1">{{ tag.name }}</a>{% if edit %} <a href="/tags/delete/{{ tag.name }}">✕</a>{% endif %}</li>
 					{% endfor %}
+					    {%- if edit %}<li><a href="/tags/add/" tabindex="-1">+</a></li>{% endif -%}
 					</ul>
 				</div><!--
 				{% for sound in sounds %}
diff --git a/templates/tags_add.html b/templates/tags_add.html
new file mode 100644
index 0000000..51f0c85
--- /dev/null
+++ b/templates/tags_add.html
@@ -0,0 +1,13 @@
+{% extends "base.html" %}
+{% block navigation %}
+{% endblock %}
+{% block content %}
+			<div class="editform">
+				<h1>Add tag</h1>
+				<form action="{{ request.path }}" method="POST">
+					<input type="text" name="tag" placeholder="tag name" />
+					<input type="submit" name="cancel" value="Cancel" />
+					<input type="submit" name="submit" value="Add" />
+				</form>
+			</div>
+{% endblock %}