diff --git a/app/javascript/dashboard/components/widgets/conversation/CannedResponse.vue b/app/javascript/dashboard/components/widgets/conversation/CannedResponse.vue
index 8826b3ea972..93c9af736a3 100644
--- a/app/javascript/dashboard/components/widgets/conversation/CannedResponse.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/CannedResponse.vue
@@ -1,5 +1,9 @@
 <template>
-  <mention-box :items="items" @mention-select="handleMentionClick" />
+  <mention-box :items="items" @mention-select="handleMentionClick">
+    <template slot-scope="{ item }">
+      <strong>{{ item.label }}</strong> - {{ item.description }}
+    </template>
+  </mention-box>
 </template>
 
 <script>
diff --git a/app/javascript/dashboard/components/widgets/conversation/VariableList.vue b/app/javascript/dashboard/components/widgets/conversation/VariableList.vue
index 91803327d2e..6128abe4346 100644
--- a/app/javascript/dashboard/components/widgets/conversation/VariableList.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/VariableList.vue
@@ -1,5 +1,12 @@
 <template>
-  <mention-box :items="items" @mention-select="handleVariableClick" />
+  <mention-box :items="items" @mention-select="handleVariableClick">
+    <template slot-scope="{ item }">
+      <span class="text-capitalize variable--list-label">
+        {{ item.description }}
+      </span>
+      ({{ item.label }})
+    </template>
+  </mention-box>
 </template>
 
 <script>
@@ -35,3 +42,8 @@ export default {
   },
 };
 </script>
+<style scoped>
+.variable--list-label {
+  font-weight: var(--font-weight-bold);
+}
+</style>
diff --git a/app/javascript/dashboard/components/widgets/mentions/MentionBox.vue b/app/javascript/dashboard/components/widgets/mentions/MentionBox.vue
index bf26f3b90f8..12d633df8d6 100644
--- a/app/javascript/dashboard/components/widgets/mentions/MentionBox.vue
+++ b/app/javascript/dashboard/components/widgets/mentions/MentionBox.vue
@@ -13,7 +13,7 @@
       @mouseover="onHover(index)"
     >
       <a class="text-truncate">
-        <strong>{{ item.label }}</strong> - {{ item.description }}
+        <slot :item="item" />
       </a>
     </li>
   </ul>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/canned/AddCanned.vue b/app/javascript/dashboard/routes/dashboard/settings/canned/AddCanned.vue
index 95ef3af63c8..1f117eb81a9 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/canned/AddCanned.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/canned/AddCanned.vue
@@ -21,18 +21,18 @@
         <div class="medium-12 columns">
           <label :class="{ error: $v.content.$error }">
             {{ $t('CANNED_MGMT.ADD.FORM.CONTENT.LABEL') }}
-            <label class="editor-wrap">
-              <woot-message-editor
-                v-model="content"
-                class="message-editor"
-                :class="{ editor_warning: $v.content.$error }"
-                :enable-variables="true"
-                :enable-canned-responses="false"
-                :placeholder="$t('CANNED_MGMT.ADD.FORM.CONTENT.PLACEHOLDER')"
-                @blur="$v.content.$touch"
-              />
-            </label>
           </label>
+          <div class="editor-wrap">
+            <woot-message-editor
+              v-model="content"
+              class="message-editor"
+              :class="{ editor_warning: $v.content.$error }"
+              :enable-variables="true"
+              :enable-canned-responses="false"
+              :placeholder="$t('CANNED_MGMT.ADD.FORM.CONTENT.PLACEHOLDER')"
+              @blur="$v.content.$touch"
+            />
+          </div>
         </div>
         <div class="modal-footer">
           <div class="medium-12 columns">
@@ -137,5 +137,17 @@ export default {
   .ProseMirror-menubar {
     display: none;
   }
+
+  .ProseMirror-woot-style {
+    min-height: 20rem;
+
+    p {
+      font-size: var(--font-size-default);
+    }
+  }
+
+  .message-editor {
+    border: 1px solid var(--s-200);
+  }
 }
 </style>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/canned/EditCanned.vue b/app/javascript/dashboard/routes/dashboard/settings/canned/EditCanned.vue
index a1c39ee7797..2ab51653c39 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/canned/EditCanned.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/canned/EditCanned.vue
@@ -18,18 +18,18 @@
         <div class="medium-12 columns">
           <label :class="{ error: $v.content.$error }">
             {{ $t('CANNED_MGMT.EDIT.FORM.CONTENT.LABEL') }}
-            <label class="editor-wrap">
-              <woot-message-editor
-                v-model="content"
-                class="message-editor"
-                :class="{ editor_warning: $v.content.$error }"
-                :enable-variables="true"
-                :enable-canned-responses="false"
-                :placeholder="$t('CANNED_MGMT.EDIT.FORM.CONTENT.PLACEHOLDER')"
-                @blur="$v.content.$touch"
-              />
-            </label>
           </label>
+          <div class="editor-wrap">
+            <woot-message-editor
+              v-model="content"
+              class="message-editor"
+              :class="{ editor_warning: $v.content.$error }"
+              :enable-variables="true"
+              :enable-canned-responses="false"
+              :placeholder="$t('CANNED_MGMT.EDIT.FORM.CONTENT.PLACEHOLDER')"
+              @blur="$v.content.$touch"
+            />
+          </div>
         </div>
         <div class="modal-footer">
           <div class="medium-12 columns">
@@ -149,5 +149,17 @@ export default {
   .ProseMirror-menubar {
     display: none;
   }
+
+  .ProseMirror-woot-style {
+    min-height: 20rem;
+
+    p {
+      font-size: var(--font-size-default);
+    }
+  }
+
+  .message-editor {
+    border: 1px solid var(--s-200);
+  }
 }
 </style>