diff --git a/src/noosfero-spb/software_communities/lib/categories_and_tags_block.rb b/src/noosfero-spb/software_communities/lib/categories_and_tags_block.rb
index e50f9c4..564ce2e 100644
--- a/src/noosfero-spb/software_communities/lib/categories_and_tags_block.rb
+++ b/src/noosfero-spb/software_communities/lib/categories_and_tags_block.rb
@@ -1,8 +1,10 @@
 class CategoriesAndTagsBlock < Block
 
   attr_accessible :show_name
+  attr_accessible :search_catalog
 
   settings_items :show_name, :type => :boolean, :default => false
+  settings_items :search_catalog, :type => :string, :default => SearchController.catalog_list[:public_software].last
 
   def self.description
     _('Categories and Tags')
diff --git a/src/noosfero-spb/software_communities/views/blocks/categories_and_tags.html.erb b/src/noosfero-spb/software_communities/views/blocks/categories_and_tags.html.erb
index 8563f07..000a270 100644
--- a/src/noosfero-spb/software_communities/views/blocks/categories_and_tags.html.erb
+++ b/src/noosfero-spb/software_communities/views/blocks/categories_and_tags.html.erb
@@ -3,7 +3,7 @@
 
 	<div class="category_cloud">
 	<% block.owner.categories.each do |category| %>
-		<%= link_to category.name, {:controller => :search, :action => :software_infos, :selected_categories_id => [category.id], :software_type => 'all'}, :id => "select-category-1-link", :class => "select-subcategory-link", :target => "_blank" %>
+		<%= link_to category.name, {:controller => :search, :action => block.search_catalog, :selected_categories_id => [category.id], :software_type => 'all'}, :id => "select-category-1-link", :class => "select-subcategory-link", :target => "_blank" %>
 	<% end %>
 	</div><!-- end class='category_cloud' -->
 <% end %>
diff --git a/src/noosfero-spb/software_communities/views/box_organizer/_categories_and_tags_block.html.erb b/src/noosfero-spb/software_communities/views/box_organizer/_categories_and_tags_block.html.erb
new file mode 100644
index 0000000..453af14
--- /dev/null
+++ b/src/noosfero-spb/software_communities/views/box_organizer/_categories_and_tags_block.html.erb
@@ -0,0 +1,6 @@
+<div id='edit-search-block' class="formfieldline">
+  <% catalog_list = SearchController.catalog_list.collect{|i,v| v} %>
+
+  <label class="formlabel"><%= _("Catalog: ") %></label>
+  <%= select 'block', 'search_catalog', catalog_list %>
+</div>
--
libgit2 0.21.2