diff --git a/CHANGELOG.md b/CHANGELOG.md
index cad0139259..7b05c77a0d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@
 - Add pointer-event for color and pattern swatches so title tags appear upon hover [#1055](https://github.com/bigcommerce/cornerstone/pull/1055)
 - Change the 403 page message to be more friendly [#1057](https://github.com/bigcommerce/cornerstone/pull/1057) & [#1059](https://github.com/bigcommerce/cornerstone/pull/1059)
 - Add bulk discount rates to product cards [#1058](https://github.com/bigcommerce/cornerstone/pull/1058)
+- Do not show add to cart on disabled products [#1063](https://github.com/bigcommerce/cornerstone/pull/1063)
 
 ## 1.9.1 (2017-07-25)
 - Move some hard-coded validation messages to language file [#1040](https://github.com/bigcommerce/cornerstone/pull/1040)
diff --git a/assets/scss/layouts/products/_productList.scss b/assets/scss/layouts/products/_productList.scss
index 12e06f4dd1..8aa84aa9d8 100644
--- a/assets/scss/layouts/products/_productList.scss
+++ b/assets/scss/layouts/products/_productList.scss
@@ -8,6 +8,7 @@
 
 .productList {
     @include u-listBullets("none");
+    margin: spacing("half");
 
     .product {
         // scss-lint:disable NestingDepth
diff --git a/templates/components/products/list-item.html b/templates/components/products/list-item.html
index af06a8adb0..1520eb00fa 100644
--- a/templates/components/products/list-item.html
+++ b/templates/components/products/list-item.html
@@ -29,17 +29,20 @@ <h4 class="listItem-title">
                 {{#if price}}
                     <div class="listItem-price">{{> components/products/price price=price}}</div>
                 {{/if}}
-                {{#unless hide_add_to_cart}}
+                {{#if show_cart_action}}
                     {{#if has_options}}
-                        <a href="{{url}}" class="button button--primary" data-product-id="{{id}}">{{lang "products.choose_options"}}</a>
-                    {{else}}
-                        {{#if out_of_stock_message }}
-                        <span href="{{url}}" class="button button--primary">{{out_of_stock_message}}</span>
-                        {{else}}
-                        <a href="{{add_to_cart_url}}" class="button button--primary">{{lang "products.add_to_cart"}}</a>
-                        {{/if}}
+                        <a href="{{url}}" class="button button--small" data-product-id="{{id}}">{{lang 'products.choose_options'}}</a>
                     {{/if}}
-                {{/unless}}
+                    {{#if pre_order}}
+                        <a href="{{url}}" class="button button--primary">{{lang 'products.pre_order'}}</a>
+                    {{/if}}
+                    {{#if add_to_cart_url }}
+                        <a href="{{add_to_cart_url}}" class="button button--primary">{{lang 'products.add_to_cart'}}</a>
+                    {{/if}}
+                    {{#if out_of_stock_message }}
+                        <a href="{{url}}" class="button button--small" data-product-id="{{id}}">{{out_of_stock_message}}</a>
+                    {{/if}}
+                {{/if}}
                 {{#if show_compare}}
                     <label class="button button--small" for="compare-{{id}}">
                         {{lang "products.compare"}} <input type="checkbox" name="products[]" value="{{id}}" id="compare-{{id}}" data-compare-id="{{id}}">