diff --git a/markdownblog/markdownblog/templates/blog/edit.html b/markdownblog/markdownblog/templates/blog/edit.html
index c01c6b2..e606275 100644
--- a/markdownblog/markdownblog/templates/blog/edit.html
+++ b/markdownblog/markdownblog/templates/blog/edit.html
@@ -19,7 +19,11 @@
                     <label>
                         Tags
                         <input type="text" id="input_tags" name="tags"
-                               value="{% if post.tags == "Blog.Tag.None" %} {% else %}{{ blog.tags }}{% endif %}">
+                               value="{% if post.tags == "Blog.Tag.None" %} {% else %}
+                               {% for tag in blog.tags %}
+                                {{ tag }}
+                               {% endfor %}
+                               {% endif %}">
                     </label>
                 </div>
                 <div class="input-field col s6">
@@ -28,6 +32,7 @@
                             <option selected>No topic</option>
                         {% else %}
                             <option selected>{{ post.topic.name }}</option>
+                            <option>No topic</option>
                         {% endif %}
                         {% for topic in alltopics %}
                             <option value="{{ topic.id }}">{{ topic.name }}</option>