diff --git a/src/pretix/control/templates/pretixcontrol/items/questions.html b/src/pretix/control/templates/pretixcontrol/items/questions.html
index 4f186ad091..fb018660e3 100644
--- a/src/pretix/control/templates/pretixcontrol/items/questions.html
+++ b/src/pretix/control/templates/pretixcontrol/items/questions.html
@@ -13,70 +13,13 @@
 
     {% if 'event.items:write' in request.eventpermset %}
         <p>
-            <a href="{% url "control:event.items.questions.add" organizer=request.event.organizer.slug event=request.event.slug %}?container_type=P" class="btn btn-default"><i class="fa fa-plus"></i> {% trans "Create a new per-ticket data field" %}
-            </a>
             <a href="{% url "control:event.items.questions.add" organizer=request.event.organizer.slug event=request.event.slug %}?container_type=O" class="btn btn-default"><i class="fa fa-plus"></i> {% trans "Create a new order-level data field" %}
             </a>
+            <a href="{% url "control:event.items.questions.add" organizer=request.event.organizer.slug event=request.event.slug %}?container_type=P" class="btn btn-default"><i class="fa fa-plus"></i> {% trans "Create a new per-ticket data field" %}
+            </a>
         </p>
     {% endif %}
 
-    <h2>{% trans "Per-ticket data fields" %}</h2>
-    <p>{% trans "These data field can be used on individual tickets." %}</p>
-
-    <div class="table-responsive">
-        <table class="table table-hover table-quotas">
-            <thead>
-            <tr>
-                <th>{% trans "Internal name" %}</th>
-                <th>{% trans "Type" %}</th>
-                <th class="iconcol"></th>
-                <th class="iconcol"></th>
-                <th class="iconcol"></th>
-                <th class="action-col-2"></th>
-            </tr>
-            </thead>
-            <tbody>
-            {% for q in questions %}{% if q.container_type == "P" %}
-                <tr>
-                    <td>
-                        <strong>
-                            <a href="{% url "control:event.items.questions.show" organizer=request.event.organizer.slug event=request.event.slug question=q.id %}">
-                                {{ q.question }}
-                            </a>
-                        </strong><br>
-                        <small class="text-muted">{{ q.identifier }}</small>
-                    </td>
-                    <td>
-                        {{ q.get_type_display }}
-                    </td>
-                    <td>
-                        {% if q.required %}
-                            <span class="fa fa-exclamation-circle text-muted" data-toggle="tooltip" title="{% trans "Required question" %}"></span>
-                        {% endif %}
-                    </td>
-                    <td>
-                        {% if q.pk and q.ask_during_checkin %}
-                            <span class="fa fa-check-square text-muted" data-toggle="tooltip" title="{% trans "Ask during check-in" %}"></span>
-                        {% endif %}
-                    </td>
-                    <td>
-                        {% if q.pk and q.hidden %}
-                            <span class="fa fa-eye-slash text-muted" data-toggle="tooltip" title="{% trans "Hidden question" %}"></span>
-                        {% endif %}
-                    </td>
-                    <td class="text-right flip">
-                        <a href="{% url "control:event.items.questions.show" organizer=request.event.organizer.slug event=request.event.slug question=q.id %}" class="btn btn-default btn-sm"><i class="fa fa-bar-chart"></i></a>
-                        {% if 'event.items:write' in request.eventpermset %}
-                            <a href="{% url "control:event.items.questions.edit" organizer=request.event.organizer.slug event=request.event.slug question=q.id %}" class="btn btn-default btn-sm"><i class="fa fa-edit"></i></a>
-                            <a href="{% url "control:event.items.questions.delete" organizer=request.event.organizer.slug event=request.event.slug question=q.id %}" class="btn btn-danger btn-sm"><i class="fa fa-trash"></i></a>
-                        {% endif %}
-                    </td>
-                </tr>
-            {% endif %}{% endfor %}
-            </tbody>
-        </table>
-    </div>
-
     <h2>{% trans "Per-order data fields" %}</h2>
     <p>{% trans "These data fields can be used on orders." %}</p>
     <div class="table-responsive">
@@ -136,4 +79,62 @@
             </tbody>
         </table>
     </div>
+
+    <h2>{% trans "Per-ticket data fields" %}</h2>
+    <p>{% trans "These data field can be used on individual tickets." %}</p>
+
+    <div class="table-responsive">
+        <table class="table table-hover table-quotas">
+            <thead>
+            <tr>
+                <th>{% trans "Internal name" %}</th>
+                <th>{% trans "Type" %}</th>
+                <th class="iconcol"></th>
+                <th class="iconcol"></th>
+                <th class="iconcol"></th>
+                <th class="action-col-2"></th>
+            </tr>
+            </thead>
+            <tbody>
+            {% for q in questions %}{% if q.container_type == "P" %}
+                <tr>
+                    <td>
+                        <strong>
+                            <a href="{% url "control:event.items.questions.show" organizer=request.event.organizer.slug event=request.event.slug question=q.id %}">
+                                {{ q.question }}
+                            </a>
+                        </strong><br>
+                        <small class="text-muted">{{ q.identifier }}</small>
+                    </td>
+                    <td>
+                        {{ q.get_type_display }}
+                    </td>
+                    <td>
+                        {% if q.required %}
+                            <span class="fa fa-exclamation-circle text-muted" data-toggle="tooltip" title="{% trans "Required question" %}"></span>
+                        {% endif %}
+                    </td>
+                    <td>
+                        {% if q.pk and q.ask_during_checkin %}
+                            <span class="fa fa-check-square text-muted" data-toggle="tooltip" title="{% trans "Ask during check-in" %}"></span>
+                        {% endif %}
+                    </td>
+                    <td>
+                        {% if q.pk and q.hidden %}
+                            <span class="fa fa-eye-slash text-muted" data-toggle="tooltip" title="{% trans "Hidden question" %}"></span>
+                        {% endif %}
+                    </td>
+                    <td class="text-right flip">
+                        <a href="{% url "control:event.items.questions.show" organizer=request.event.organizer.slug event=request.event.slug question=q.id %}" class="btn btn-default btn-sm"><i class="fa fa-bar-chart"></i></a>
+                        {% if 'event.items:write' in request.eventpermset %}
+                            <a href="{% url "control:event.items.questions.edit" organizer=request.event.organizer.slug event=request.event.slug question=q.id %}" class="btn btn-default btn-sm"><i class="fa fa-edit"></i></a>
+                            <a href="{% url "control:event.items.questions.delete" organizer=request.event.organizer.slug event=request.event.slug question=q.id %}" class="btn btn-danger btn-sm"><i class="fa fa-trash"></i></a>
+                        {% endif %}
+                    </td>
+                </tr>
+            {% endif %}{% endfor %}
+            </tbody>
+        </table>
+    </div>
+
 {% endblock %}