diff --git a/app/blueprints/packages/packages.py b/app/blueprints/packages/packages.py
index 12ec32c..05fbffc 100644
--- a/app/blueprints/packages/packages.py
+++ b/app/blueprints/packages/packages.py
@@ -99,7 +99,7 @@ def list_all():
 	selected_tags = set(qb.tags)
 
 	return render_template("packages/list.html",
-			title=title, packages=query.items, pagination=query,
+			query_hint=title, packages=query.items, pagination=query,
 			query=search, tags=tags, selected_tags=selected_tags, type=type_name,
 			authors=authors, packages_count=query.total, topics=topics)
 
diff --git a/app/templates/base.html b/app/templates/base.html
index dc65848..3c67604 100644
--- a/app/templates/base.html
+++ b/app/templates/base.html
@@ -45,7 +45,7 @@
 				<form class="form-inline my-2 my-lg-0" method="GET" action="/packages/">
 					{% if type %}<input type="hidden" name="type" value="{{ type }}" />{% endif %}
 					<input class="form-control" name="q" type="text"
-						placeholder="{{ _('Search %(type)s', type=title | lower or 'all packages') }}"
+						placeholder="{% if query_hint %}{{ _('Search %(type)s', type=query_hint | lower) }}{% else %}{{ _('Search all packages') }}{% endif %}
 						value="{{ query or ''}}">
 					<input class="btn btn-secondary my-2 my-sm-0 mr-sm-2" type="submit" value="{{ _('Search') }}" />
 					<!-- <input class="btn btn-secondary my-2 my-sm-0"