diff --git a/pylons_app/templates/search/search.html b/pylons_app/templates/search/search.html
--- a/pylons_app/templates/search/search.html
+++ b/pylons_app/templates/search/search.html
@@ -1,7 +1,13 @@
 ## -*- coding: utf-8 -*-
 <%inherit file="/base/base.html"/>
 <%def name="title()">
-   ${_('Search')}: ${c.cur_query}
+   ${_('Search')} 
+	%if c.repo_name:
+		${_('in repository: ') + c.repo_name}
+	%else:
+		${_('in all repositories')}		
+	%endif
+	:${c.cur_query}
 </%def>
 <%def name="breadcrumbs()">
 	${c.hg_app_name}
@@ -14,16 +20,26 @@
 <div class="box">
 	<!-- box / title -->
 	<div class="title">
-		<h5>${_('Search')}</h5>
+		<h5>${_('Search')}
+		%if c.repo_name:
+			${_('in repository: ') + c.repo_name}
+		%else:
+			${_('in all repositories')}
+		%endif		
+		</h5>
 	</div>
 	<!-- end box / title -->
-	${h.form('search',method='get')}
+	%if c.repo_name:
+		${h.form(h.url('search_repo',search_repo=c.repo_name),method='get')}	
+	%else:
+		${h.form(h.url('search'),method='get')}
+	%endif
 	<div class="form">
 		<div class="fields">
 		
 			<div class="field ">
 				<div class="label">
-					<label for="q">${_('Search:')}</label>
+					<label for="q">${_('Search')}:</label>
 				</div>
 				<div class="input">
 					${h.text('q',c.cur_query,class_="small")}