diff --git a/app/views/search/index.rhtml b/app/views/search/index.rhtml
index f77c70f..438d875 100644
--- a/app/views/search/index.rhtml
+++ b/app/views/search/index.rhtml
@@ -1,4 +1,4 @@
-<h2> <%=h @category ? (_('Search results for "%{query}" in %{category}') % { :query => @query, :category => @category.full_name}) : (_('Search results for "%s"') % @query) %> </h2>
+<h2> <%=h @category ? (_('Search results for "%{query}" in "%{category}"') % { :query => @query, :category => @category.name}) : (_('Search results for "%s"') % @query) %> </h2>
 
 <%= render :partial => 'display_results' %>
 
diff --git a/test/functional/search_controller_test.rb b/test/functional/search_controller_test.rb
index 201385c..9f4499d 100644
--- a/test/functional/search_controller_test.rb
+++ b/test/functional/search_controller_test.rb
@@ -493,5 +493,13 @@ class SearchControllerTest < Test::Unit::TestCase
     get :index, :category_path => [ 'my-category' ], :query => 'a sample search'
     assert_tag :tag => 'a', :attributes => { :href => "/search?query=a+sample+search" }, :content => 'Search for "a sample search" in the whole site'
   end
+
+  should 'display only category name in "search results for ..." title' do
+    parent = Category.create!(:name => 'Parent Category', :environment => Environment.default)
+    child = Category.create!(:name => "Child Category", :environment => Environment.default, :parent => parent)
+
+    get :index, :category_path => [ 'parent-category', 'child-category' ], :query => 'a sample search'
+    assert_tag :tag => 'h2', :content => /Search results for &quot;a sample search&quot; in &quot;Child Category&quot;/
+  end
   
 end
--
libgit2 0.21.2