diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/KtTypeParameter.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/KtTypeParameter.java
index fd39d8c327b..a814947f0e5 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/psi/KtTypeParameter.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/KtTypeParameter.java
@@ -18,6 +18,10 @@ package org.jetbrains.kotlin.psi;
 
 import com.intellij.lang.ASTNode;
 import com.intellij.psi.PsiElement;
+import com.intellij.psi.search.GlobalSearchScope;
+import com.intellij.psi.search.LocalSearchScope;
+import com.intellij.psi.search.SearchScope;
+import com.intellij.psi.util.PsiTreeUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.kotlin.lexer.KtTokens;
@@ -82,4 +86,11 @@ public class KtTypeParameter extends KtNamedDeclarationStub<KotlinTypeParameterS
     public KtTypeReference getExtendsBound() {
         return getStubOrPsiChild(KtStubElementTypes.TYPE_REFERENCE);
     }
+
+    @NotNull
+    @Override
+    public SearchScope getUseScope() {
+        KtTypeParameterListOwner owner = PsiTreeUtil.getParentOfType(this, KtTypeParameterListOwner.class);
+        return owner != null ? new LocalSearchScope(owner) : GlobalSearchScope.EMPTY_SCOPE;
+    }
 }
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/KotlinRefactoringSupportProvider.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/KotlinRefactoringSupportProvider.kt
index 59e7a3d54fe..c6005743380 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/KotlinRefactoringSupportProvider.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/KotlinRefactoringSupportProvider.kt
@@ -51,6 +51,7 @@ class KotlinRefactoringSupportProvider : RefactoringSupportProvider() {
 
     override fun isInplaceRenameAvailable(element: PsiElement, context: PsiElement?): Boolean {
         when (element) {
+            is KtTypeParameter -> return true
             is KtProperty -> {
                 if (element.isLocal) return true
             }