diff --git a/app/helpers/follows_helper.rb b/app/helpers/follows_helper.rb
index e4923f2b9..b04835b95 100644
--- a/app/helpers/follows_helper.rb
+++ b/app/helpers/follows_helper.rb
@@ -62,6 +62,10 @@ module FollowsHelper
     }.invert[entity]
   end
 
+  def entity_partial(class_name)
+    class_name.parameterize.gsub('-','_')
+  end
+
   private
 
     def followed?(followable)
diff --git a/app/views/users/_following.html.erb b/app/views/users/_following.html.erb
index defac258a..110d012aa 100644
--- a/app/views/users/_following.html.erb
+++ b/app/views/users/_following.html.erb
@@ -17,11 +17,8 @@
         <table>
           <tbody>
             <% @follows.where(followable_type: followable_type).each do |follow| %>
-              <% if followable_type == "Proposal" %>
-                <%= render "proposal", proposal: follow.followable %>
-              <% elsif followable_type == "Budget::Investment" %>
-                <%= render "budget_investment", budget_investment: follow.followable %>
-              <% end %>
+              <%= render entity_partial(followable_type),
+                         entity_partial(followable_type).to_sym => follow.followable %>
             <% end %>
           </tbody>
         </table>
diff --git a/app/views/users/_proposal.html.erb b/app/views/users/_proposal.html.erb
index cd41de6f8..9144de099 100644
--- a/app/views/users/_proposal.html.erb
+++ b/app/views/users/_proposal.html.erb
@@ -7,14 +7,18 @@
 
   <% if proposal.retired? %>
 
+    <td class="text-center">
+      <span class="label alert"><%= t('users.proposals.retired') %></span>
+    </td>
+
+  <% elsif author?(proposal) %>
+
     <td class="text-center">
       <%= link_to t("users.proposals.send_notification"),
                   new_proposal_notification_path(proposal_id: proposal.id),
                   class: 'button hollow' %>
     </td>
 
-  <% elsif author?(proposal) %>
-
     <td class="text-center">
       <% if proposal.retired? %>
         <span class="label alert"><%= t('users.proposals.retired') %></span>