diff --git a/ayanova/src/components/pick-list.vue b/ayanova/src/components/pick-list.vue
index 0dca60b0..72cecbd5 100644
--- a/ayanova/src/components/pick-list.vue
+++ b/ayanova/src/components/pick-list.vue
@@ -21,8 +21,6 @@
       :no-filter="isTagFilter"
       :append-icon="errorIcon"
       @click:append="handleErrorClick"
-      :prepend-icon="editIcon()"
-      @click:prepend="handleEditClick"
       @mousedown="dropdown"
     >
       <template v-slot:prepend-item v-if="hasError()">
@@ -30,6 +28,10 @@
           <span class="error--text"> {{ errors[0] }}</span>
         </div>
       </template>
+
+      <template v-slot:prepend>
+        <v-icon @click="handleEditClick">{{ editIcon() }}</v-icon>
+      </template>
     </v-autocomplete>
   </div>
 </template>
@@ -125,6 +127,7 @@ export default {
         data: "ay-start-form-select-list"
       });
     },
+
     editIcon: function() {
       if (!this.showEditIcon) {
         return null;