diff --git a/app/assets/stylesheets/participation.scss b/app/assets/stylesheets/participation.scss
index 0873e7c7c..270005f88 100644
--- a/app/assets/stylesheets/participation.scss
+++ b/app/assets/stylesheets/participation.scss
@@ -870,6 +870,12 @@
   }
 }
 
+.investment-project .supports .total-supports.no-button,
+.investment-project-show .supports .total-supports.no-button {
+  display: block;
+  margin-top: $line-height*1.5;
+}
+
 // 05. Featured
 // - - - - - - - - - - - - - - - - - - - - - - - - -
 
diff --git a/app/models/spending_proposal.rb b/app/models/spending_proposal.rb
index 7a3dda7c6..d8ae2acf0 100644
--- a/app/models/spending_proposal.rb
+++ b/app/models/spending_proposal.rb
@@ -113,11 +113,11 @@ class SpendingProposal < ActiveRecord::Base
   end
 
   def reason_for_not_being_votable_by(user)
+    return :not_voting_allowed if Setting["feature.spending_proposal_features.voting_allowed"].blank?
     return :not_logged_in unless user
     return :not_verified  unless user.can?(:vote, SpendingProposal)
     return :unfeasible    if unfeasible?
     return :organization  if user.organization?
-    return :not_voting_allowed if Setting["feature.spending_proposal_features.voting_allowed"].blank?
   end
 
   def votable_by?(user)
diff --git a/app/views/spending_proposals/_votes.html.erb b/app/views/spending_proposals/_votes.html.erb
index 8dbc2aa3f..85220d6c9 100644
--- a/app/views/spending_proposals/_votes.html.erb
+++ b/app/views/spending_proposals/_votes.html.erb
@@ -1,15 +1,19 @@
 <div class="supports">
 
-  <span class="total-supports">
+  <% reason = spending_proposal.reason_for_not_being_votable_by(current_user) %>
+  <% voting_allowed = true unless reason.presence == :not_voting_allowed %>
+  <% user_voted_for = voted_for?(@spending_proposal_votes, spending_proposal) %>
+
+  <span class="total-supports <%= 'no-button' unless voting_allowed || user_voted_for %>">
     <%= t("spending_proposals.spending_proposal.supports", count: spending_proposal.total_votes) %>
   </span>
 
   <div class="in-favor">
-    <% if voted_for?(@spending_proposal_votes, spending_proposal) %>
+    <% if user_voted_for %>
       <div class="supported">
         <%= t("spending_proposals.spending_proposal.already_supported") %>
       </div>
-    <% else %>
+    <% elsif voting_allowed %>
       <%= link_to vote_url,
           class: "button button-support small expanded",
           title: t('spending_proposals.spending_proposal.support_title'), method: "post", remote: true do %>
@@ -18,9 +22,7 @@
     <% end %>
   </div>
 
-  <% reason = spending_proposal.reason_for_not_being_votable_by(current_user) %>
-
-  <% if reason.present? && !voted_for?(@spending_proposal_votes, spending_proposal) %>
+  <% if reason.present? && !user_voted_for %>
     <div class="no-supports-allowed" style='display:none'>
       <p>
           <%= t("votes.spending_proposals.#{reason}",
@@ -32,7 +34,7 @@
     </div>
   <% end %>
 
-  <% if voted_for?(@spending_proposal_votes, spending_proposal) && setting['twitter_handle'] %>
+  <% if user_voted_for && setting['twitter_handle'] %>
     <div class="share-supported">
       <%= social_share_button_tag("#{spending_proposal.title} #{setting['twitter_hashtag']}", url: spending_proposal_url(spending_proposal), via: setting['twitter_handle']) %>
     </div>
diff --git a/spec/support/common_actions.rb b/spec/support/common_actions.rb
index 762119130..340d7c8a7 100644
--- a/spec/support/common_actions.rb
+++ b/spec/support/common_actions.rb
@@ -176,7 +176,7 @@ module CommonActions
 
   def expect_message_voting_not_allowed
     expect(page).to have_content 'Voting phase is closed'
-    expect(page).to have_selector('.in-favor a', visible: false)
+    expect(page).to_not have_selector('.in-favor a')
   end
 
   def create_featured_proposals