diff --git a/idea/src/org/jetbrains/jet/plugin/editor/wordSelection/KotlinCodeBlockSelectioner.kt b/idea/src/org/jetbrains/jet/plugin/editor/wordSelection/KotlinCodeBlockSelectioner.kt
index 5ff0417b4f2..f6c8fef4119 100644
--- a/idea/src/org/jetbrains/jet/plugin/editor/wordSelection/KotlinCodeBlockSelectioner.kt
+++ b/idea/src/org/jetbrains/jet/plugin/editor/wordSelection/KotlinCodeBlockSelectioner.kt
@@ -33,7 +33,7 @@ import com.intellij.codeInsight.editorActions.ExtendWordSelectionHandlerBase
 /**
  * Originally from IDEA platform: CodeBlockOrInitializerSelectioner
  */
-public class KotlinCodeBlockSelectioner : BasicSelectioner() {
+public class KotlinCodeBlockSelectioner : ExtendWordSelectionHandlerBase() {
     override fun canSelect(e: PsiElement)
             = e is JetBlockExpression || e is JetWhenExpression
 
diff --git a/idea/src/org/jetbrains/jet/plugin/editor/wordSelection/KotlinDeclarationSelectioner.kt b/idea/src/org/jetbrains/jet/plugin/editor/wordSelection/KotlinDeclarationSelectioner.kt
index 35e2502573a..27abdc3a326 100644
--- a/idea/src/org/jetbrains/jet/plugin/editor/wordSelection/KotlinDeclarationSelectioner.kt
+++ b/idea/src/org/jetbrains/jet/plugin/editor/wordSelection/KotlinDeclarationSelectioner.kt
@@ -27,7 +27,7 @@ import org.jetbrains.jet.lang.psi.psiUtil.siblings
 import com.intellij.psi.PsiComment
 import com.intellij.psi.PsiWhiteSpace
 
-public class KotlinDeclarationSelectioner : BasicSelectioner() {
+public class KotlinDeclarationSelectioner : ExtendWordSelectionHandlerBase() {
     override fun canSelect(e: PsiElement)
             = e is JetDeclaration
 
diff --git a/idea/src/org/jetbrains/jet/plugin/editor/wordSelection/KotlinDocCommentSelectioner.kt b/idea/src/org/jetbrains/jet/plugin/editor/wordSelection/KotlinDocCommentSelectioner.kt
index 3124a2a86f3..e620e2e005f 100644
--- a/idea/src/org/jetbrains/jet/plugin/editor/wordSelection/KotlinDocCommentSelectioner.kt
+++ b/idea/src/org/jetbrains/jet/plugin/editor/wordSelection/KotlinDocCommentSelectioner.kt
@@ -28,7 +28,7 @@ import java.util.ArrayList
 import com.intellij.codeInsight.editorActions.ExtendWordSelectionHandlerBase
 import org.jetbrains.jet.kdoc.psi.api.KDoc
 
-public class KotlinDocCommentSelectioner : BasicSelectioner() {
+public class KotlinDocCommentSelectioner : ExtendWordSelectionHandlerBase() {
     override fun canSelect(e: PsiElement)
             = e is KDoc
 
diff --git a/idea/src/org/jetbrains/jet/plugin/editor/wordSelection/KotlinListSelectioner.kt b/idea/src/org/jetbrains/jet/plugin/editor/wordSelection/KotlinListSelectioner.kt
index 6a10c3151a3..707fe4fc49a 100644
--- a/idea/src/org/jetbrains/jet/plugin/editor/wordSelection/KotlinListSelectioner.kt
+++ b/idea/src/org/jetbrains/jet/plugin/editor/wordSelection/KotlinListSelectioner.kt
@@ -16,8 +16,6 @@
 
 package org.jetbrains.jet.plugin.editor.wordSelection
 
-import com.intellij.codeInsight.editorActions.wordSelection.BasicSelectioner
-import com.intellij.lang.ASTNode
 import com.intellij.openapi.editor.Editor
 import com.intellij.openapi.util.TextRange
 import com.intellij.psi.PsiElement
@@ -27,10 +25,9 @@ import org.jetbrains.jet.lang.psi.JetTypeArgumentList
 import org.jetbrains.jet.lang.psi.JetTypeParameterList
 import org.jetbrains.jet.lang.psi.JetValueArgumentList
 import org.jetbrains.jet.lexer.JetTokens
+import com.intellij.codeInsight.editorActions.ExtendWordSelectionHandlerBase
 
-import java.util.Arrays
-
-public class KotlinListSelectioner : BasicSelectioner() {
+public class KotlinListSelectioner : ExtendWordSelectionHandlerBase() {
     override fun canSelect(e: PsiElement)
             = e is JetParameterList || e is JetValueArgumentList || e is JetTypeParameterList || e is JetTypeArgumentList
 
diff --git a/idea/src/org/jetbrains/jet/plugin/editor/wordSelection/KotlinStatementGroupSelectioner.kt b/idea/src/org/jetbrains/jet/plugin/editor/wordSelection/KotlinStatementGroupSelectioner.kt
index 8c261721731..d73c17b7df9 100644
--- a/idea/src/org/jetbrains/jet/plugin/editor/wordSelection/KotlinStatementGroupSelectioner.kt
+++ b/idea/src/org/jetbrains/jet/plugin/editor/wordSelection/KotlinStatementGroupSelectioner.kt
@@ -35,7 +35,7 @@ import org.jetbrains.jet.lang.psi.psiUtil.siblings
 /**
  * Originally from IDEA platform: StatementGroupSelectioner
  */
-public class KotlinStatementGroupSelectioner : BasicSelectioner() {
+public class KotlinStatementGroupSelectioner : ExtendWordSelectionHandlerBase() {
     override fun canSelect(e: PsiElement)
             = e is JetExpression || e is JetWhenEntry