diff --git a/app/views/accounts/index.html.haml b/app/views/accounts/index.html.haml
index d1a9dc84b6..9a997b0eb3 100644
--- a/app/views/accounts/index.html.haml
+++ b/app/views/accounts/index.html.haml
@@ -2,7 +2,8 @@
 
 .title_tools
   = link_to_inline(:create_account, new_account_path, :text => t(:create_account)) << " | "
-  = link_to_inline(:advanced_search, advanced_search_accounts_path, :text => t(:advanced_search)) << " | "
+  - if Setting.advanced_search_enabled
+    = link_to_inline(:advanced_search, advanced_search_accounts_path, :text => t(:advanced_search)) << " | "
   = link_to_inline(:options, options_accounts_path, :text=> t(:options))
 
 .title
diff --git a/app/views/campaigns/index.html.haml b/app/views/campaigns/index.html.haml
index f73f4f1db8..30d11e5573 100644
--- a/app/views/campaigns/index.html.haml
+++ b/app/views/campaigns/index.html.haml
@@ -2,7 +2,8 @@
 
 .title_tools
   = link_to_inline(:create_campaign, new_campaign_path, :text => t(:create_campaign)) << " | "
-  = link_to_inline(:advanced_search, advanced_search_campaigns_path, :text => t(:advanced_search)) << " | "
+  - if Setting.advanced_search_enabled
+    = link_to_inline(:advanced_search, advanced_search_campaigns_path, :text => t(:advanced_search)) << " | "
   = link_to_inline(:options, options_campaigns_path, :text => t(:options))
 
 .title
diff --git a/app/views/contacts/index.html.haml b/app/views/contacts/index.html.haml
index 9921aaabf2..f76f2d2f63 100644
--- a/app/views/contacts/index.html.haml
+++ b/app/views/contacts/index.html.haml
@@ -2,7 +2,8 @@
 
 .title_tools
   = link_to_inline(:create_contact, new_contact_path, :text=> t(:create_contact)) << " | "
-  = link_to_inline(:advanced_search, advanced_search_contacts_path, :text => t(:advanced_search)) << " | "
+  - if Setting.advanced_search_enabled
+    = link_to_inline(:advanced_search, advanced_search_contacts_path, :text => t(:advanced_search)) << " | "
   = link_to_inline(:options, options_contacts_path, :text=> t(:options))
 
 .title
diff --git a/app/views/layouts/_sidebar.html.haml b/app/views/layouts/_sidebar.html.haml
index 01d66d75ee..d37c95c873 100644
--- a/app/views/layouts/_sidebar.html.haml
+++ b/app/views/layouts/_sidebar.html.haml
@@ -7,5 +7,8 @@
 - begin
   = render sidebar
   - rescue MissingTemplate
-= render "shared/lists"
+
+- if Setting.advanced_search_enabled  
+  = render "shared/lists"
+  
 = render "shared/recently"
diff --git a/app/views/leads/index.html.haml b/app/views/leads/index.html.haml
index 4ec9251b56..2c8abdd8fa 100644
--- a/app/views/leads/index.html.haml
+++ b/app/views/leads/index.html.haml
@@ -2,7 +2,8 @@
 
 .title_tools
   = link_to_inline(:create_lead, new_lead_path, :text => t(:create_lead)) << " | "
-  = link_to_inline(:advanced_search, advanced_search_leads_path, :text => t(:advanced_search)) << " | "
+  - if Setting.advanced_search_enabled
+    = link_to_inline(:advanced_search, advanced_search_leads_path, :text => t(:advanced_search)) << " | "
   = link_to_inline(:options, options_leads_path, :text => t(:options))
 
 .title
diff --git a/app/views/opportunities/index.html.haml b/app/views/opportunities/index.html.haml
index 6d1a205684..d8ef7a2555 100644
--- a/app/views/opportunities/index.html.haml
+++ b/app/views/opportunities/index.html.haml
@@ -2,7 +2,8 @@
 
 .title_tools
   = link_to_inline(:create_opportunity, new_opportunity_path, :text => t(:create_opportunity)) << " | "
-  = link_to_inline(:advanced_search, advanced_search_opportunities_path, :text => t(:advanced_search)) << " | "
+  - if Setting.advanced_search_enabled
+    = link_to_inline(:advanced_search, advanced_search_opportunities_path, :text => t(:advanced_search)) << " | "
   = link_to_inline(:options, options_opportunities_path, :text => t(:options))
 
 .title
diff --git a/config/settings.yml.example b/config/settings.yml.example
index f2a8534bd5..7afdf87796 100644
--- a/config/settings.yml.example
+++ b/config/settings.yml.example
@@ -287,3 +287,9 @@ task_completed:
   - :completed_this_month
   - :completed_last_month
 
+
+# Alpha features
+#------------------------------------------------------------------------------
+# Enable the advanced search feature provided by Ransack
+# (Feature works, but UI design is still in progress)
+advanced_search_enabled: false