diff --git a/soundboard.py b/soundboard.py
index cc0da8a..f104b1b 100644
--- a/soundboard.py
+++ b/soundboard.py
@@ -94,6 +94,24 @@ def edit(sound):
 		# TODO: Store changes
 		return redirect("/edit")
 
-	tags = queryDB("SELECT name FROM tag ORDER BY name COLLATE NOCASE")
+	tags = queryDB("""\
+SELECT
+	tag.name,
+	checked.id IS NOT NULL AS checked
+FROM
+	tag
+LEFT OUTER JOIN (
+	SELECT
+		tag.id
+	FROM
+		tag
+	JOIN
+		button_tags
+	ON
+		fk_tag = tag.id
+	WHERE fk_button = 1
+) AS checked
+ON tag.id = checked.id""")
+	print(tags)
 
 	return render_template("edit.html", sound=sound, tags=tags)
diff --git a/templates/edit.html b/templates/edit.html
index d9182ad..2c4ceb7 100644
--- a/templates/edit.html
+++ b/templates/edit.html
@@ -8,7 +8,7 @@
 					<input type="text" id="search" placeholder="Search Tag" />
 					<ul class="tags">
 						{% for tag in tags %}
-							<li class="tag"><span>{{ tag.name }}</span><input type="checkbox" /></li>
+							<li class="tag"><span>{{ tag.name }}</span><input type="checkbox" {{ 'checked="true" '|safe if tag.checked }}/></li>
 						{% endfor %}
 					</ul>
 					<input type="button" value="Cancel" />