diff --git a/src/main/java/de/marhali/easyi18n/editor/generic/GenericKeyCompletionContributor.java b/src/main/java/de/marhali/easyi18n/editor/generic/GenericKeyCompletionContributor.java
index a8277d3..e958285 100644
--- a/src/main/java/de/marhali/easyi18n/editor/generic/GenericKeyCompletionContributor.java
+++ b/src/main/java/de/marhali/easyi18n/editor/generic/GenericKeyCompletionContributor.java
@@ -2,8 +2,10 @@ package de.marhali.easyi18n.editor.generic;
 
 import com.intellij.codeInsight.completion.CompletionContributor;
 import com.intellij.codeInsight.completion.CompletionType;
+import com.intellij.lang.*;
 import com.intellij.patterns.*;
-import com.intellij.psi.PsiLiteralValue;
+import com.intellij.psi.*;
+import com.intellij.psi.xml.*;
 import de.marhali.easyi18n.editor.KeyCompletionProvider;
 
 /**
@@ -13,8 +15,11 @@ import de.marhali.easyi18n.editor.KeyCompletionProvider;
 public class GenericKeyCompletionContributor extends CompletionContributor {
 
     public GenericKeyCompletionContributor() {
-//        extend(CompletionType.BASIC, PlatformPatterns.psiElement().inside(PsiLiteralValue.class),
-//                new KeyCompletionProvider());
-        extend(CompletionType.BASIC, PlatformPatterns.psiElement(), new KeyCompletionProvider());
+        extend(CompletionType.BASIC, PlatformPatterns.psiElement(PlainTextTokenTypes.PLAIN_TEXT),
+                new KeyCompletionProvider());
+        extend(CompletionType.BASIC, PlatformPatterns.psiElement().inside(XmlElement.class),
+                new KeyCompletionProvider());
+        extend(CompletionType.BASIC, PlatformPatterns.psiElement().inside(PsiLiteralValue.class),
+                new KeyCompletionProvider());
     }
 }
\ No newline at end of file