diff --git a/src/app/components/topics-select/topics-select.directive.js b/src/app/components/topics-select/topics-select.directive.js
index 7000ac8..9df5b85 100644
--- a/src/app/components/topics-select/topics-select.directive.js
+++ b/src/app/components/topics-select/topics-select.directive.js
@@ -24,23 +24,19 @@
     }
 
     TopicsSelectController.prototype.init = function() {
-      var vm = this;
-
-      // vm.topics = null;
-      // vm.selectedTopic = null;
-      vm.topicFilter = vm.selectedTopic;
+      // var vm = this;
     };
 
     TopicsSelectController.prototype.selectTopic = function() {
       var vm = this;
 
-      if (vm.topicFilter === null) {
+      if (vm.selectedTopic === null) {
         vm.$log.debug('Default topic selected.');
         return;
       }
 
       // send event to all controllers
-      vm.$rootScope.$broadcast('change-selectedTopic', vm.topicFilter);
+      vm.$rootScope.$broadcast('change-selectedTopic', vm.selectedTopic);
     };
 
     var directive = {
diff --git a/src/app/components/topics-select/topics-select.html b/src/app/components/topics-select/topics-select.html
index ae804dd..d1a61c9 100644
--- a/src/app/components/topics-select/topics-select.html
+++ b/src/app/components/topics-select/topics-select.html
@@ -1,9 +1,8 @@
 <div class="topics-dropdown">
   <select
-    ng-model="vm.topicFilter"
+    ng-model="vm.selectedTopic"
     ng-change="vm.selectTopic()"
     ng-options="topic.title for topic in vm.topics track by topic.slug"
     class="form-control">
-    <option value="">-- Selecione um programa --</option>
   </select>
 </div>
diff --git a/src/app/pages/propostas/propostas.controller.js b/src/app/pages/propostas/propostas.controller.js
index c8a3288..c3dae9b 100644
--- a/src/app/pages/propostas/propostas.controller.js
+++ b/src/app/pages/propostas/propostas.controller.js
@@ -100,7 +100,6 @@
     var vm = this;
 
     vm.DialogaService.getProgramsByThemeId(themeId, function (programs){
-      vm.$log.debug('programs', programs);
 
       vm.filtredPrograms = programs;
 
@@ -164,12 +163,16 @@
     vm.$scope.$watch('pagePropostas.selectedTheme', function(newValue, oldValue) {
       vm.search.tema = newValue ? newValue.slug : null;
       vm.$location.search('tema', vm.search.tema);
-      vm.filtredProposals = vm.getFiltredProposals();
+
+      if(vm.selectedTheme && vm.selectedTheme.id){
+        vm.loadPrograms(vm.selectedTheme.id, function(){
+          vm.filtredProposals = vm.getFiltredProposals();
+        });
+      }
     });
 
     vm.$scope.$on('change-selectedTopic', function (event, selectedTopic) {
       vm.selectedProgram = selectedTopic;
-      vm.$log.debug('change-selectedTopic', selectedTopic);
     });
 
     vm.$scope.$watch('pagePropostas.selectedProgram', function(newValue, oldValue) {
@@ -185,23 +188,6 @@
     });
   };
 
-  // PropostasPageController.prototype.filter = function() {
-  //   var vm = this;
-
-  //   if (vm.search && vm.search.tema) {
-  //     var slug = vm.search.tema;
-  //     vm.$log.debug('filter by theme', slug);
-
-  //     vm.DialogaService.getThemeBySlug(slug, function(theme){
-  //       vm.selectedTheme = theme;
-  //       vm.$log.debug('getThemeBySlug.slug', slug);
-  //       vm.$log.debug('getThemeBySlug.selectedTheme', theme);
-  //     }, function(error){
-  //       vm.$log.error('Error when try to "getThemeBySlug"', error);
-  //     });
-  //   }
-  // };
-
   PropostasPageController.prototype.showAllPrograms = function($event) {
     var vm = this;
     $event.stopPropagation();
diff --git a/src/app/pages/propostas/ranking.html b/src/app/pages/propostas/ranking.html
index e8a0bb8..f2f3c53 100644
--- a/src/app/pages/propostas/ranking.html
+++ b/src/app/pages/propostas/ranking.html
@@ -23,7 +23,7 @@
 					<div ng-if="pagePropostas.themes">
 						<category-list categories="pagePropostas.themes" selected-category="pagePropostas.selectedTheme" disable-unselect="true"></category-list>
 					</div>
-					<div ng-if="pagePropostas.filtredPrograms" class="topics-select--wrapper">
+					<div ng-if="pagePropostas.filtredPrograms && pagePropostas.selectedProgram" class="topics-select--wrapper">
 						<topics-select topics="pagePropostas.filtredPrograms" selected-topic="pagePropostas.selectedProgram"></topics-select>
 					</div>
 					<div ng-if="!pagePropostas.themes && pagePropostas.loadingThemes">
--
libgit2 0.21.2