diff --git a/src/noosfero-spb/software_communities/features/software_catalog.feature b/src/noosfero-spb/software_communities/features/software_catalog.feature
index 8bb6207..42d7a7c 100644
--- a/src/noosfero-spb/software_communities/features/software_catalog.feature
+++ b/src/noosfero-spb/software_communities/features/software_catalog.feature
@@ -104,7 +104,7 @@ Feature: Search software
     And I go to /profile/software-two/plugin/organization_ratings/new_rating
     And I press "Enviar"
     And I go to /search/software_infos
-    When I select "Favorites" from "sort"
+    When I select "Rating" from "sort"
     And I sleep for 3 seconds
     Then I should see "Software Two" before "Software One"
     And there should be 1 div with class "small-star-positive"
diff --git a/src/noosfero-spb/software_communities/views/search/_catalog_filter.html.erb b/src/noosfero-spb/software_communities/views/search/_catalog_filter.html.erb
index e6a9dd7..b97d614 100644
--- a/src/noosfero-spb/software_communities/views/search/_catalog_filter.html.erb
+++ b/src/noosfero-spb/software_communities/views/search/_catalog_filter.html.erb
@@ -6,8 +6,10 @@
       <ul>
         <% @categories.each do |category| %>
         <li>
-          <%= check_box_tag("selected_categories_id[]", category.id, @selected_categories_id.include?(category.id), :class => "categories-catalog", @enabled_check_box[category] => "true") %>
-          <span><%= _("#{category.name}") %></span>
+          <label>
+            <%= check_box_tag("selected_categories_id[]", category.id, @selected_categories_id.include?(category.id), :class => "categories-catalog", @enabled_check_box[category] => "true") %>
+            <span><%= _("#{category.name}") %></span>
+          </label>
         </li>
         <% end %>
       </ul>
--
libgit2 0.21.2