diff --git a/packages/oui-criteria-adder/src/criteria-adder.controller.js b/packages/oui-criteria-adder/src/criteria-adder.controller.js
index f2c231bc..fee4d2e6 100644
--- a/packages/oui-criteria-adder/src/criteria-adder.controller.js
+++ b/packages/oui-criteria-adder/src/criteria-adder.controller.js
@@ -31,6 +31,8 @@ export default class {
 
         this.selectableOperators = this.filterSelectableOperators();
         this.operatorModel = this.selectableOperators[0];
+
+        this.resetValueModel();
     }
 
     $postLink () {
diff --git a/packages/oui-criteria-adder/src/criteria-adder.html b/packages/oui-criteria-adder/src/criteria-adder.html
index 721b11b6..bf63d189 100644
--- a/packages/oui-criteria-adder/src/criteria-adder.html
+++ b/packages/oui-criteria-adder/src/criteria-adder.html
@@ -15,6 +15,7 @@
                     ng-attr-id="{{::$ctrl.id}}Column"
                     name="{{::$ctrl.name}}Column"
                     model="$ctrl.columnModel"
+                    ng-click="$event.stopPropagation()"
                     items="$ctrl.properties"
                     match="title"
                     on-change="$ctrl.onColumnChange()">
@@ -29,6 +30,7 @@
                     ng-attr-id="{{::$ctrl.id}}Operator"
                     name="{{::$ctrl.name}}Operator"
                     model="$ctrl.operatorModel"
+                    ng-click="$event.stopPropagation()"
                     items="$ctrl.selectableOperators"
                     match="title">
                     <span ng-bind="$item.title"></span>
@@ -65,6 +67,7 @@
                         <oui-select
                             name="{{::$ctrl.name}}Value"
                             model="$ctrl.valueModel['boolean']"
+                            ng-click="$event.stopPropagation()"
                             items="$ctrl.booleanChoices"
                             match="name"
                             data-align="start">
@@ -80,6 +83,7 @@
                         <oui-select
                             name="{{::$ctrl.name}}Value"
                             model="$ctrl.valueModel['options']"
+                            ng-click="$event.stopPropagation()"
                             items="$ctrl.optionsChoices"
                             match="name"
                             data-align="start">