diff --git a/platform/lang-impl/src/com/intellij/codeInsight/template/impl/InvokeTemplateAction.java b/platform/lang-impl/src/com/intellij/codeInsight/template/impl/InvokeTemplateAction.java
index 693b3dba1a24..56f2f8e118d2 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/template/impl/InvokeTemplateAction.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/template/impl/InvokeTemplateAction.java
@@ -41,7 +41,8 @@ public class InvokeTemplateAction extends AnAction {
   private final Project myProject;
 
   public InvokeTemplateAction(TemplateImpl template, Editor editor, Project project, Set<Character> usedMnemonicsSet) {
-    super(extractMnemonic(template.getKey(), usedMnemonicsSet) + ". " + template.getDescription());
+    super(extractMnemonic(template.getKey(), usedMnemonicsSet) +
+          (StringUtil.isEmptyOrSpaces(template.getDescription()) ? "" : ". " + template.getDescription()));
     myTemplate = template;
     myProject = project;
     myEditor = editor;