diff --git a/src/pretix/control/templates/pretixcontrol/items/question_delete.html b/src/pretix/control/templates/pretixcontrol/items/question_delete.html
index 36aaf3e88a..5119a58de4 100644
--- a/src/pretix/control/templates/pretixcontrol/items/question_delete.html
+++ b/src/pretix/control/templates/pretixcontrol/items/question_delete.html
@@ -8,9 +8,13 @@
 		{% csrf_token %}
 		<p>{% blocktrans %}Are you sure you want to delete the question <strong>{{ question }}</strong>?{% endblocktrans %}</p>
 		{% if dependent|length > 0 %}
-			<p>{% blocktrans %}All answers to the question given by the buyers of the following products will be <strong>lost</strong>.{% endblocktrans %}</p>
+			<div class="alert alert-warning">
+				<p>{% blocktrans %}All answers to the question given by the buyers of the following products will be <strong>lost</strong>.{% endblocktrans %}
+					{% blocktrans with url=edit_url|add:"#tab-0-1-open" %}If you want to keep the answers, <a href="{{url}}">edit the question</a> and set it to hidden.{% endblocktrans %}
+				</p>
+			</div>
 			{% for item in dependent %}
-				<li><a href="{% url "control:event.item" organizer=request.event.organizer.slug event=request.event.slug item=item.pk %}">{{ item.name }}</a></li>
+				<li><a href="{% url "control:event.item" organizer=request.event.organizer.slug event=request.event.slug item=item.pk %}">{{ item }}</a></li>
 			{% endfor %}
 		{% endif %}
 		<div class="form-group submit-group">
@@ -18,7 +22,7 @@
                 {% trans "Cancel" %}
             </a>
             <button type="submit" class="btn btn-danger btn-save">
-                {% trans "Delete" %}
+                {% trans "Delete question and all answers" %}
             </button>
 		</div>
 	</form>
diff --git a/src/pretix/control/views/item.py b/src/pretix/control/views/item.py
index 02deb3fc65..e1fa7aece9 100644
--- a/src/pretix/control/views/item.py
+++ b/src/pretix/control/views/item.py
@@ -573,6 +573,11 @@ class QuestionDelete(EventPermissionRequiredMixin, CompatDeleteView):
     def get_context_data(self, *args, **kwargs) -> dict:
         context = super().get_context_data(*args, **kwargs)
         context['dependent'] = list(self.get_object().items.all())
+        context['edit_url'] = reverse('control:event.items.questions.edit', kwargs={
+            'organizer': self.request.event.organizer.slug,
+            'event': self.request.event.slug,
+            'question': self.get_object().pk,
+        })
         return context
 
     @transaction.atomic