diff --git a/lib/mpog_software_plugin.rb b/lib/mpog_software_plugin.rb
index 0b0c420..ee86fb6 100644
--- a/lib/mpog_software_plugin.rb
+++ b/lib/mpog_software_plugin.rb
@@ -130,7 +130,6 @@ class MpogSoftwarePlugin < Noosfero::Plugin
       mpog-search.js
       software-catalog.js
       mpog-software-block.js
-      catalog-filter.js
     )
   end
 
diff --git a/public/catalog-filter.js b/public/catalog-filter.js
deleted file mode 100644
index 6ae5905..0000000
--- a/public/catalog-filter.js
+++ /dev/null
@@ -1,59 +0,0 @@
-jQuery(function(){
-  function show_head_message() {
-    if (jQuery("#filter-categories-select-catalog").text().blank()){
-      jQuery("#filter-categories-select-catalog").hide();
-      jQuery("#filter-option-catalog-software").show();
-    }else{
-      jQuery("#filter-categories-select-catalog").show();
-      jQuery("#filter-option-catalog-software").hide();
-    }
-  }
-
-  show_head_message();
-
-  jQuery("#filter-categories-option").hide();
-  jQuery("#filter-option-catalog-software").click(function(){
-    jQuery("#filter-categories-option").slideDown();
-    jQuery("#filter-option-catalog-software").hide();
-  });
-
-  jQuery("#filter-categories-option").hide();
-  jQuery("#filter-categories-select-catalog").click(function(){
-    jQuery("#filter-categories-option").slideDown();
-    jQuery("#filter-categories-select-catalog").hide();
-  });
-
-  jQuery("#close-filter-catalog").click(function(){
-    jQuery("#filter-categories-option").slideUp();
-    show_head_message();
-  });
-
-  jQuery("#cleanup-filter-catalg").click(function(){
-    jQuery("#filter-categories-option").slideUp();
-    jQuery("#filter-option-catalog-software").show();
-    jQuery("#group-categories input:checked").each(function() {
-      jQuery(this).prop('checked', false);
-    });
-  });
-
-  jQuery(".categories-catalog").click(function(){
-    jQuery("#filter-categories-option").slideUp();
-    jQuery("#filter-categories-select-catalog").show();
-    jQuery("#filter-option-catalog-software").hide();
-  });
-
-  jQuery(".project-software").click(function(){
-    jQuery("#filter-categories-option").slideUp();
-    jQuery("#filter-categories-select-catalog").show();
-    jQuery("#filter-option-catalog-software").hide();
-  });
-
-  function clear_categories_filter(e) {
-    e.preventDefault();
-    jQuery("#categories-filter input:checked").each(function() {
-      jQuery(this).prop('checked', false);
-    });
-  }
-});
-
-
diff --git a/public/software-catalog.js b/public/software-catalog.js
index 1025b5b..ade9512 100644
--- a/public/software-catalog.js
+++ b/public/software-catalog.js
@@ -55,6 +55,51 @@
     jQuery(this).parent().remove();
   }
 
+  function show_head_message() {
+    if (jQuery("#filter-categories-select-catalog").text().blank()){
+      jQuery("#filter-categories-select-catalog").hide();
+      jQuery("#filter-option-catalog-software").show();
+    }else{
+      jQuery("#filter-categories-select-catalog").show();
+      jQuery("#filter-option-catalog-software").hide();
+    }
+  }
+
+  function slideDowsCategoriesOptionAndHideOptionCatalog() {
+    jQuery("#filter-categories-option").slideDown();
+    jQuery("#filter-option-catalog-software").hide();
+  }
+
+  function slideDownCategoriesOptionAndHideCategoriesSelect() {
+    jQuery("#filter-categories-option").slideDown();
+    jQuery("#filter-categories-select-catalog").hide();
+  }
+
+  function slideUpCategoriesAndShowHeadMessage() {
+    jQuery("#filter-categories-option").slideUp();
+    show_head_message();
+  }
+
+  function clearCatalogCheckbox(){
+    jQuery("#filter-categories-option").slideUp();
+    jQuery("#filter-option-catalog-software").show();
+    jQuery("#group-categories input:checked").each(function() {
+      jQuery(this).prop('checked', false);
+    });
+  }
+
+  function selectCheckboxCategory() {
+    jQuery("#filter-categories-option").slideUp();
+    jQuery("#filter-categories-select-catalog").show();
+    jQuery("#filter-option-catalog-software").hide();
+  }
+
+  function selectProjectSoftwareCheckbox() {
+    jQuery("#filter-categories-option").slideUp();
+    jQuery("#filter-categories-select-catalog").show();
+    jQuery("#filter-option-catalog-software").hide();
+  }
+
   function set_autocomplate() {
     jQuery("#software-catalog").autocomplete({
       source : function(request, response){
@@ -84,10 +129,20 @@
 
   function set_events() {
     jQuery(".catalog-remove-item").click(remote_catalog_item);
+    jQuery("#filter-option-catalog-software").click(slideDowsCategoriesOptionAndHideOptionCatalog);
+    jQuery("#filter-categories-select-catalog").click(slideDownCategoriesOptionAndHideCategoriesSelect);
+    jQuery("#close-filter-catalog").click(slideUpCategoriesAndShowHeadMessage);
+    jQuery("#cleanup-filter-catalg").click(clearCatalogCheckbox);
+    jQuery(".categories-catalog").click(selectCheckboxCategory);
+    jQuery(".project-software").click(selectProjectSoftwareCheckbox);
   }
 
+
   jQuery(document).ready(function(){
     set_autocomplate();
     set_events();
+    show_head_message();
+    jQuery("#filter-categories-option").hide();
   });
+
 })();
--
libgit2 0.21.2