diff --git a/cookbook/helper/property_helper.py b/cookbook/helper/property_helper.py
index b89f0bda..7e09a13a 100644
--- a/cookbook/helper/property_helper.py
+++ b/cookbook/helper/property_helper.py
@@ -44,8 +44,8 @@ class FoodPropertyHelper:
                 for pt in property_types:
                     found_property = False
                     if i.food.properties_food_amount == 0 or i.food.properties_food_unit is None:
-                        computed_properties[pt.id]['missing_value'] = True
                         computed_properties[pt.id]['food_values'][i.food.id] = {'id': i.food.id, 'food': i.food.name, 'value': 0}
+                        computed_properties[pt.id]['missing_value'] = i.food.properties_food_unit is None
                     else:
                         for p in i.food.properties.all():
                             if p.property_type == pt:
diff --git a/vue/src/components/FoodEditor.vue b/vue/src/components/FoodEditor.vue
index 882bbc4b..4d63824e 100644
--- a/vue/src/components/FoodEditor.vue
+++ b/vue/src/components/FoodEditor.vue
@@ -293,6 +293,7 @@ export default {
         if (this.item1.id !== undefined) {
             pf = apiClient.retrieveFood(this.item1.id).then((r) => {
                 this.food = r.data
+                this.food.properties_food_unit = {name: 'g'}
             }).catch(err => {
                 StandardToasts.makeStandardToast(this, StandardToasts.FAIL_FETCH, err)
             })
diff --git a/vue/src/components/PropertyViewComponent.vue b/vue/src/components/PropertyViewComponent.vue
index 14d37e4d..322c2e3a 100644
--- a/vue/src/components/PropertyViewComponent.vue
+++ b/vue/src/components/PropertyViewComponent.vue
@@ -21,9 +21,9 @@
                         <span v-if="show_recipe_properties">{{ $t('Recipe') }} </span>
 
                         <a href="#" @click="show_recipe_properties = !show_recipe_properties">
-                        <i class="fas fa-toggle-on" v-if="!show_recipe_properties"></i>
-                        <i class="fas fa-toggle-off" v-if="show_recipe_properties"></i>
-                    </a>
+                            <i class="fas fa-toggle-on" v-if="!show_recipe_properties"></i>
+                            <i class="fas fa-toggle-off" v-if="show_recipe_properties"></i>
+                        </a>
                     </div>
 
                 </b-col>
@@ -53,7 +53,7 @@
         </div>
 
 
-        <b-modal id="id_modal_property_overview" title="Property Overview" v-model="show_modal"
+        <b-modal id="id_modal_property_overview" :title="selected_property.name" v-model="show_modal" v-if="selected_property !== undefined"
                  @hidden="selected_property = undefined">
             <template v-if="selected_property !== undefined">
                 {{ selected_property.description }}