diff --git a/main/webapp/modules/core/scripts/facets/list-facet.js b/main/webapp/modules/core/scripts/facets/list-facet.js
index b4f01f49c..41e5b9342 100644
--- a/main/webapp/modules/core/scripts/facets/list-facet.js
+++ b/main/webapp/modules/core/scripts/facets/list-facet.js
@@ -142,7 +142,11 @@ ListFacet.prototype._initializeUI = function() {
     
     this._elmts.titleSpan.text(this._config.name);
     this._elmts.changeButton.attr("title","Current Expression: " + this._config.expression).click(function() {
-        self._elmts.expressionDiv.slideToggle(100);
+        self._elmts.expressionDiv.slideToggle(100, function() {
+            if (self._elmts.expressionDiv.css("display") != "none") {
+                self._editExpression();
+            }
+        });
     });
     this._elmts.expressionDiv.text(this._config.expression).hide().click(function() { self._editExpression(); });
     this._elmts.removeButton.click(function() { self._remove(); });
diff --git a/main/webapp/modules/core/scripts/facets/range-facet.js b/main/webapp/modules/core/scripts/facets/range-facet.js
index 44712853c..419005c1a 100644
--- a/main/webapp/modules/core/scripts/facets/range-facet.js
+++ b/main/webapp/modules/core/scripts/facets/range-facet.js
@@ -121,7 +121,11 @@ RangeFacet.prototype._initializeUI = function() {
     
     this._elmts.facetTitle.text(this._config.name);
     this._elmts.changeButton.attr("title","Current Expression: " + this._config.expression).click(function() {
-        self._elmts.expressionDiv.slideToggle(100);
+        self._elmts.expressionDiv.slideToggle(100, function() {
+            if (self._elmts.expressionDiv.css("display") != "none") {
+                self._editExpression();
+            }
+        });
     });
     this._elmts.expressionDiv.text(this._config.expression).click(function() { 
         self._editExpression(); 
diff --git a/main/webapp/modules/core/scripts/facets/timerange-facet.js b/main/webapp/modules/core/scripts/facets/timerange-facet.js
index 2ef1ba1e4..4daecd47e 100644
--- a/main/webapp/modules/core/scripts/facets/timerange-facet.js
+++ b/main/webapp/modules/core/scripts/facets/timerange-facet.js
@@ -122,7 +122,11 @@ TimeRangeFacet.prototype._initializeUI = function() {
     
     this._elmts.facetTitle.text(this._config.name);
     this._elmts.changeButton.attr("title","Current Expression: " + this._config.expression).click(function() {
-        self._elmts.expressionDiv.slideToggle(100);
+        self._elmts.expressionDiv.slideToggle(100, function() {
+            if (self._elmts.expressionDiv.css("display") != "none") {
+                self._editExpression();
+            }
+        });
     });
     this._elmts.expressionDiv.text(this._config.expression).click(function() { 
         self._editExpression();