diff --git a/app/imports/ui/creature/character/CharacterSheetFab.vue b/app/imports/ui/creature/character/CharacterSheetFab.vue
index ca105cc4..829424e2 100644
--- a/app/imports/ui/creature/character/CharacterSheetFab.vue
+++ b/app/imports/ui/creature/character/CharacterSheetFab.vue
@@ -31,7 +31,7 @@
       :key="type"
       color="primary"
       :data-id="`insert-creature-property-type-${type}`"
-      :label="type ? 'New ' + properties[type].name : 'New Property'"
+      :label="getPropertyLabel(type)"
       :icon="type ? properties[type].icon : 'mdi-plus'"
       :disabled="!editPermission"
       @click="addProperty(type)"
@@ -125,7 +125,7 @@
         return this.speedDialsByTab[tabs[this.tabNumber]];
       },
       speedDialsByTab() { return {
-        'stats': ['attribute', 'skill', 'action', 'attack'],
+        'stats': ['attribute', 'skill', 'action', 'attack', 'buff'],
         'features': ['feature'],
         'inventory': ['item', 'container'],
         'spells': ['spellList', 'spell'],
@@ -137,6 +137,10 @@
       },
     },
     methods: {
+      getPropertyLabel(type){
+        if (type === 'buff') return 'Buff or Condition';
+        return type ? PROPERTIES[type].name : 'Property'
+      },
       addProperty(forcedType){
         let creatureId = this.creatureId;
         let fab = hideFab();
diff --git a/app/imports/ui/properties/forms/BuffForm.vue b/app/imports/ui/properties/forms/BuffForm.vue
index ba51ce17..dab578ec 100644
--- a/app/imports/ui/properties/forms/BuffForm.vue
+++ b/app/imports/ui/properties/forms/BuffForm.vue
@@ -8,23 +8,21 @@
       @change="change('name', ...arguments)"
     />
     <smart-switch
-      v-if="context.isLibraryForm"
-      label="Add to character sheet already applied"
+      label="Applied"
       class="mt-0"
       :value="model.applied"
       :error-messages="errors.applied"
       @change="change('applied', ...arguments)"
     />
     <v-expand-transition>
-      <div v-if="context.isLibraryForm && model.applied">
+      <div v-if="model.applied">
         <v-alert
-          v-if="context.isLibraryForm && model.applied"
           type="info"
           outlined
         >
-          Buffs that are applied are active on the character sheet. This
-          should be turned off if a buff is going to be applied by an action or
-          spell.
+          When buffs are applied they become active on a creature.
+          Turn this off if the buff needs to be applied to a target by an action
+          or spell.
         </v-alert>
       </div>
     </v-expand-transition>
@@ -78,9 +76,6 @@
       CalculationErrorList,
     },
     mixins: [propertyFormMixin],
-    inject: {
-      context: { default: {} }
-    },
 		props: {
 			parentTarget: {
 				type: String,