diff --git a/app/views/spree/products/_source.html.haml b/app/views/spree/products/_source.html.haml
index 2c82ae2b85..2d2f6f361e 100644
--- a/app/views/spree/products/_source.html.haml
+++ b/app/views/spree/products/_source.html.haml
@@ -22,7 +22,6 @@
           %tr.even
             %td= link_to distributor.name, [main_app, distributor]
             %td Available
-            -#%td= link_to "Change to distributor", select_distributor_order_path(distributor)
         - else
           %tr.even
             %td= link_to distributor.name, [main_app, distributor]
diff --git a/app/views/spree/products/_source_sidebar.html.haml b/app/views/spree/products/_source_sidebar.html.haml
index f3861ea748..9a87c353cb 100644
--- a/app/views/spree/products/_source_sidebar.html.haml
+++ b/app/views/spree/products/_source_sidebar.html.haml
@@ -12,9 +12,7 @@
     - validator = DistributionChangeValidator.new(order)
     - @distributors.each do |distributor|
       %li.nowrap
-        - if order.nil? || validator.can_change_to_distributor?(distributor)
-          = link_to distributor.name, [main_app, distributor]
-        - elsif order.distributor == distributor
+        - if order.nil? || order.distributor == distributor || validator.can_change_to_distributor?(distributor)
           = link_to distributor.name, [main_app, distributor]
         - else
           %abbr(title="One or more of the products in your cart is not available from this distributor")= distributor.name