diff --git a/src/main/webapp/scripts/facets/list-facet.js b/src/main/webapp/scripts/facets/list-facet.js
index 3a2863057..8d9f0d6d4 100644
--- a/src/main/webapp/scripts/facets/list-facet.js
+++ b/src/main/webapp/scripts/facets/list-facet.js
@@ -155,9 +155,8 @@ ListFacet.prototype._initializeUI = function() {
         
     this._elmts.sortGroup.buttonset();
     
-    if (this._config.expression == "value") {
-        this._elmts.clusterLink.click(function() { self._doEdit(); }).button();
-    } else {
+    this._elmts.clusterLink.click(function() { self._doEdit(); }).button();
+    if (this._config.expression != "value" && this._config.expression != "gel:value") {
         this._elmts.clusterLink.hide();
     }
     
@@ -511,7 +510,14 @@ ListFacet.prototype._editExpression = function() {
         function(expr) {
             if (expr != self._config.expression) {
                 self._config.expression = expr;
+                
                 self._elmts.expressionDiv.text(self._config.expression);
+                if (self._config.expression == "value" || self._config.expression == "gel:value") {
+                    self._elmts.clusterLink.show();
+                } else {
+                    self._elmts.clusterLink.hide();
+                }
+                
                 self.reset();
                 self._updateRest();
             }