diff --git a/public/app/plugins/datasource/tempo/language_provider.ts b/public/app/plugins/datasource/tempo/language_provider.ts
index 27c13e5516e..5b6aee44a32 100644
--- a/public/app/plugins/datasource/tempo/language_provider.ts
+++ b/public/app/plugins/datasource/tempo/language_provider.ts
@@ -69,12 +69,13 @@ export default class TempoLanguageProvider extends LanguageProvider {
     tagName = tagName.split('=')[0];
 
     const response = await this.request(`/api/search/tag/${tagName}/values`, []);
+
     const suggestions: CompletionItemGroup[] = [];
 
     if (response && response.tagValues) {
       suggestions.push({
         label: `Tag Values`,
-        items: response.tagValues.map((tagValue: string) => ({ label: tagValue })),
+        items: response.tagValues.map((tagValue: string) => ({ label: tagValue, insertText: `"${tagValue}"` })),
       });
     }
     return { suggestions };