diff --git a/api/urls.py b/api/urls.py
index 23aafe36..2570ded9 100644
--- a/api/urls.py
+++ b/api/urls.py
@@ -23,6 +23,7 @@ urlpatterns = [
 	path('api/autocomplete/skola/', views.SkolaAutocomplete.as_view(), name='autocomplete_skola'),
 	path('api/autocomplete/resitel/', org_required(views.ResitelAutocomplete.as_view()), name='autocomplete_resitel'),
 	path('api/autocomplete/problem/odevzdatelny', views.OdevzdatelnyProblemAutocomplete.as_view(), name='autocomplete_problem_odevzdatelny'),
+	path('api/autocomplete/problem/vsechny', views.ProblemAutocomplete.as_view(), name='autocomplete_problem'),
 
 	# Ceka na autocomplete v3
 	# path('autocomplete/organizatori/',
diff --git a/api/views/autocomplete.py b/api/views/autocomplete.py
index 217df008..4cd2552a 100644
--- a/api/views/autocomplete.py
+++ b/api/views/autocomplete.py
@@ -66,6 +66,15 @@ class OdevzdatelnyProblemAutocomplete(autocomplete.Select2QuerySetView):
 					Q(nazev__icontains=self.q))
 		return qs
 
+class ProblemAutocomplete(autocomplete.Select2QuerySetView):
+	""" View k :mod:`dal.autocomplete` pro vyhledávání problémů především v odevzdávátku. """
+	def get_queryset(self):
+		qs = m.Problem.objects.all().order_by("-stav", "nazev")
+		if self.q:
+			qs = qs.filter(
+					Q(nazev__icontains=self.q))
+		return qs
+
 # Ceka na autocomplete v3
 # class OrganizatorAutocomplete(autocomplete.Select2QuerySetView):
 # 	def get_queryset(self):
diff --git a/odevzdavatko/forms.py b/odevzdavatko/forms.py
index a8538668..65a8b7ac 100644
--- a/odevzdavatko/forms.py
+++ b/odevzdavatko/forms.py
@@ -91,7 +91,7 @@ class JednoHodnoceniForm(forms.ModelForm):
 		fields = ('problem', 'body', 'deadline_body', 'feedback',)
 		widgets = {
 			'problem': autocomplete.ModelSelect2(
-				url='autocomplete_problem_odevzdatelny',   # FIXME: Dovolit i starší?
+				url='autocomplete_problem',
 				),
 			'feedback': forms.Textarea(attrs={'rows': 1, 'cols': 30, 'class': 'feedback'}),
 			}