diff --git a/lib/shared/addon/components/form-contextual-select-array/component.js b/lib/shared/addon/components/form-contextual-select-array/component.js
index 4b22b86d8..eb0d78db4 100644
--- a/lib/shared/addon/components/form-contextual-select-array/component.js
+++ b/lib/shared/addon/components/form-contextual-select-array/component.js
@@ -32,7 +32,7 @@ export default Component.extend({
       get(this, 'values').removeAt(index);
     }
   },
-  lastValue: computed('values', {
+  lastValue: computed('values', 'values.[]', {
     get() {
       return get(this, 'values').objectAt(get(this, 'values.length') - 1);
     },
@@ -43,7 +43,8 @@ export default Component.extend({
     }
   }),
   canAddMore: computed('filteredContent', function() {
-    return get(this, 'filteredContent.length') > 1;
+    return get(this, 'filteredContent.length') > 1
+      || get(this, 'filteredContent.length') > 0 && get(this, 'values.length') === 0;
   }),
   lastIndex: computed('values.[]', function() {
     return get(this, 'values.length') - 1;