diff --git a/CHANGELOG.md b/CHANGELOG.md
index fad14654ec..9645de7426 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,7 @@
 # Changelog
 
 ## Draft
+- Fix "Shop by Price" toggle in theme editor to hide Shop by Price when faceted search is not enabled. [#1161](https://github.com/bigcommerce/cornerstone/pull/1161)
 
 ## 1.13.0 (2018-02-05)
 - Fix logo not loading on order confirmation page [#1159](https://github.com/bigcommerce/cornerstone/pull/1159)
diff --git a/config.json b/config.json
index 5ed740577a..65402b2a9e 100644
--- a/config.json
+++ b/config.json
@@ -55,7 +55,7 @@
     "productpage_related_products_count": 10,
     "productpage_similar_by_views_count": 10,
     "categorypage_products_per_page": 12,
-    "shop_by_price_visible": true,
+    "shop_by_price_visibility": true,
     "brandpage_products_per_page": 12,
     "searchpage_products_per_page": 12,
     "show_product_quick_view": true,
diff --git a/schema.json b/schema.json
index 60f4fc419c..3f2d30e4ed 100644
--- a/schema.json
+++ b/schema.json
@@ -1155,6 +1155,12 @@
         "force_reload": true,
         "id": "show_product_dimensions"
       },
+      {
+        "type": "checkbox",
+        "label": "Show "Shop by Price"",
+        "force_reload": true,
+        "id": "shop_by_price_visibility"
+      },
       {
         "type": "select",
         "label": "Number of Related Products",
@@ -1379,12 +1385,6 @@
           }
         ]
       },
-      {
-        "type": "checkbox",
-        "label": "Show "Shop by Price"",
-        "force_reload": true,
-        "id": "shop_by_price_visible"
-      },
       {
         "type": "select",
         "label": "Brand pages",
diff --git a/templates/components/category/shop-by-price.html b/templates/components/category/shop-by-price.html
index 05313f4fdb..bbfa2e6397 100644
--- a/templates/components/category/shop-by-price.html
+++ b/templates/components/category/shop-by-price.html
@@ -1,4 +1,4 @@
-{{#if shop_by_price}}
+{{#if theme_settings.shop_by_price_visibility}}
     <div class="sidebarBlock">
         <h5 class="sidebarBlock-heading">{{lang 'category.shop_by_price'}}</h5>
         <ul class="navList">
diff --git a/templates/pages/category.html b/templates/pages/category.html
index ded1b39084..81ab341d81 100644
--- a/templates/pages/category.html
+++ b/templates/pages/category.html
@@ -24,16 +24,10 @@ <h1 class="page-heading">{{category.name}}</h1>
 {{{category.description}}}
 {{{snippet 'categories'}}}
 <div class="page">
-    {{#or category.subcategories category.faceted_search_enabled}}
+    {{#or category.subcategories category.faceted_search_enabled category.shop_by_price}}
         <aside class="page-sidebar" id="faceted-search-container">
             {{> components/category/sidebar}}
         </aside>
-    {{else}}
-        {{#if theme_settings.shop_by_price_visible}}
-            <aside class="page-sidebar" id="faceted-search-container">
-                {{> components/category/sidebar}}
-            </aside>
-        {{/if}}
     {{/or}}
     <main class="page-content" id="product-listing-container">
         {{#if category.products}}