diff --git a/java/java-impl/src/com/intellij/codeInsight/editorActions/wordSelection/CodeBlockOrInitializerSelectioner.java b/java/java-impl/src/com/intellij/codeInsight/editorActions/wordSelection/CodeBlockOrInitializerSelectioner.java
index ed46781f6921..d880291b597b 100644
--- a/java/java-impl/src/com/intellij/codeInsight/editorActions/wordSelection/CodeBlockOrInitializerSelectioner.java
+++ b/java/java-impl/src/com/intellij/codeInsight/editorActions/wordSelection/CodeBlockOrInitializerSelectioner.java
@@ -26,7 +26,7 @@ import java.util.List;
 public class CodeBlockOrInitializerSelectioner extends BasicSelectioner {
   @Override
   public boolean canSelect(@NotNull PsiElement e) {
-    return e instanceof PsiCodeBlock || e instanceof PsiArrayInitializerExpression;
+    return e instanceof PsiCodeBlock || e instanceof PsiArrayInitializerExpression || e instanceof PsiClass;
   }
 
   @Override
diff --git a/java/java-impl/src/com/intellij/codeInsight/editorActions/wordSelection/JavaTokenSelectioner.java b/java/java-impl/src/com/intellij/codeInsight/editorActions/wordSelection/JavaTokenSelectioner.java
index 1837d203a6cb..9869910511f2 100644
--- a/java/java-impl/src/com/intellij/codeInsight/editorActions/wordSelection/JavaTokenSelectioner.java
+++ b/java/java-impl/src/com/intellij/codeInsight/editorActions/wordSelection/JavaTokenSelectioner.java
@@ -15,9 +15,9 @@
  */
 package com.intellij.codeInsight.editorActions.wordSelection;
 
-import com.intellij.psi.*;
-import com.intellij.openapi.util.TextRange;
 import com.intellij.openapi.editor.Editor;
+import com.intellij.openapi.util.TextRange;
+import com.intellij.psi.*;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.List;
@@ -25,7 +25,7 @@ import java.util.List;
 public class JavaTokenSelectioner extends BasicSelectioner {
   @Override
   public boolean canSelect(@NotNull PsiElement e) {
-    return e instanceof PsiJavaToken && !(e instanceof PsiKeyword) && !(e.getParent()instanceof PsiCodeBlock);
+    return e instanceof PsiJavaToken && !(e instanceof PsiKeyword) && !(e.getParent()instanceof PsiCodeBlock) && !(e.getParent() instanceof PsiClass);
   }
 
   @Override