diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index aa584d32011c0d94368a7c61b15cb4ec0c79399c..1d6cdb62510e51ce655ad199202ee492f3d8395e 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -99,6 +99,7 @@ Views 2.3
     o #366666 by Deadmonk also yched: File size field should not try to print a size on NULL values.
     o #367203: Improper caching of default views caused incomplete handlers that could WSOD.
     o #365283: views_handler_filter_ncs_last_updated improperly registered causing fatal errors trying to use it.
+    o #365712: select list exposed filters were trying to limit to list when selecting "All" even when "limit" was not selected.
 
   Other changes:
     o #288801 by drewish and eaton: Aggregator item support! Make views of feeds!
diff --git a/handlers/views_handler_filter_in_operator.inc b/handlers/views_handler_filter_in_operator.inc
index 1e1876687d90f3b3bb640361e643cdb15c895201..b2d3f60082ba2d98a3232bc2ea7885436616b35b 100644
--- a/handlers/views_handler_filter_in_operator.inc
+++ b/handlers/views_handler_filter_in_operator.inc
@@ -145,8 +145,8 @@ class views_handler_filter_in_operator extends views_handler_filter {
     }
 
     // If this is single and optional, this says that yes this filter will
-    // participate, but using the default settings.
-    if (!empty($this->options['expose']['single']) && !empty($this->options['expose']['optional'])) {
+    // participate, but using the default settings, *if* 'limit is true.
+    if (!empty($this->options['expose']['single']) && !empty($this->options['expose']['optional']) && !empty($this->options['expose']['limit'])) {
       $identifier = $this->options['expose']['identifier'];
       if ($input[$identifier] == 'All') {
         return TRUE;