diff --git a/app/templates/layout.html b/app/templates/layout.html
index 8920020..fc5929b 100644
--- a/app/templates/layout.html
+++ b/app/templates/layout.html
@@ -35,7 +35,13 @@
 			{% if field.type == 'SelectField' %}
 				<select id="{{ field.id }}" name="{{ field.id }}" class="form-control">
 					{% for choice in field.choices %}
-						<option value="{{ choice[0] }}">{{ choice[1] }}</option>
+						<option value="{{ choice[0] }}" {% if choice[0] == field.default %}selected="selected"{%endif%}>{{ choice[1] }}</option>
+					{% endfor %}
+				</select>
+			{% elif field.type == 'SelectMultipleField' %}
+				<select id="{{ field.id }}" name="{{ field.id }}" class="form-control" multiple="multiple">
+					{% for choice in field.choices %}
+						<option value="{{ choice[0] }}" {% if choice[0] in field.default %}selected="selected"{%endif%}>{{ choice[1] }}</option>
 					{% endfor %}
 				</select>
 			{% elif field.type == 'BooleanField' %}