diff --git a/client/app/components/parameter-settings.html b/client/app/components/parameter-settings.html
index 5315bed8f..12f79975a 100644
--- a/client/app/components/parameter-settings.html
+++ b/client/app/components/parameter-settings.html
@@ -13,6 +13,7 @@
         <select ng-model="$ctrl.parameter.type" class="form-control">
           <option value="text">Text</option>
           <option value="number">Number</option>
+          <option value="enum">Enum</option>
           <option value="date">Date</option>
           <option value="datetime-local">Date and Time</option>
           <option value="datetime-with-seconds">Date and Time (with seconds)</option>
@@ -22,5 +23,9 @@
         <label>Global</label>
         <input type="checkbox" class="form-inline" ng-model="$ctrl.parameter.global">
       </div>
+      <div class="form-group">
+        <label>Values (newline delimited)</label>
+        <textarea class="form-control" rows="3" ng-model="$ctl.parameter.enumOptions">
+      </div>
     </div>
 </div>
diff --git a/client/app/components/parameters.html b/client/app/components/parameters.html
index 9e01be1f3..361d626dd 100644
--- a/client/app/components/parameters.html
+++ b/client/app/components/parameters.html
@@ -6,6 +6,11 @@
       <input ng-switch-when="datetime-with-seconds" type="datetime-local" step="1" class="form-control" ng-model="param.ngModel">
       <input ng-switch-when="datetime-local" type="datetime-local" class="form-control" ng-model="param.ngModel">
       <input ng-switch-when="date" type="date" class="form-control" ng-model="param.ngModel">
+      <span ns-switch-when="enum">
+        <select ns-model="param.value" class="form-control">
+          <option ng-repeat="option in param.enumOptions.split('\n')" value="{{option}}">{{option}}</option>
+        </select>
+      </span>
       <input ng-switch-default type="{{param.type}}" class="form-control" ng-model="param.ngModel">
     </span>
   </div>
diff --git a/client/app/services/query.js b/client/app/services/query.js
index ef98857be..05f607f64 100644
--- a/client/app/services/query.js
+++ b/client/app/services/query.js
@@ -50,6 +50,7 @@ class Parameter {
     this.type = parameter.type;
     this.value = parameter.value;
     this.global = parameter.global;
+    this.enumOptions = parameter.enumOptions;
   }
 
   get ngModel() {