diff --git a/app/helpers/proposals_helper.rb b/app/helpers/proposals_helper.rb
index f6060603f..5b6cfb0b3 100644
--- a/app/helpers/proposals_helper.rb
+++ b/app/helpers/proposals_helper.rb
@@ -44,8 +44,4 @@ module ProposalsHelper
     current_user && @proposal.editable_by?(current_user)
   end
 
-  def show_actions_menu?
-    can_create_document? || author_of_proposal? || current_editable?
-  end
-
 end
\ No newline at end of file
diff --git a/app/views/proposals/show.html.erb b/app/views/proposals/show.html.erb
index 46db56ce6..9525516ed 100644
--- a/app/views/proposals/show.html.erb
+++ b/app/views/proposals/show.html.erb
@@ -104,11 +104,11 @@
       </div>
 
       <aside class="small-12 medium-3 column">
-        <% if show_actions_menu? %>
+        <% if can_create_document? || author_of_proposal? || current_editable? %>
           <div class="sidebar-divider"></div>
           <h2><%= t("proposals.show.author") %></h2>
           <div class="show-actions-menu">
-            <% if can?(:create, @document) && @proposal.documents.size < Proposal.max_documents_allowed %>
+            <% if can_create_document? %>
               <%= link_to new_document_path(documentable_id: @proposal, documentable_type: @proposal.class.name, from: request.url),
                           class: 'button hollow expanded' do %>
                           <span class="icon-document"></span>
@@ -116,7 +116,7 @@
               <% end %>
             <% end %>
 
-            <% if author_of?(@proposal, current_user) %>
+            <% if author_of_proposal? %>
               <%= link_to new_proposal_notification_path(proposal_id: @proposal.id),
                           class: 'button hollow expanded' do %>
                           <span class="icon-no-notification"></span>
@@ -124,7 +124,7 @@
               <% end %>
             <% end %>
 
-            <% if current_user && @proposal.editable_by?(current_user) %>
+            <% if current_editable? %>
               <%= link_to edit_proposal_path(@proposal), class: 'edit-proposal button hollow expanded' do %>
                 <span class="icon-edit"></span>
                 <%= t("proposals.show.edit_proposal_link") %>