diff --git a/idea/src/META-INF/plugin.xml b/idea/src/META-INF/plugin.xml
index 1cb76215231..3c9da1c04cc 100644
--- a/idea/src/META-INF/plugin.xml
+++ b/idea/src/META-INF/plugin.xml
@@ -296,6 +296,7 @@
                                id="KotlinProperty"
                                order="first"/>
     <renameHandler implementation="org.jetbrains.jet.plugin.refactoring.rename.RenameKotlinImplicitLambdaParameter"/>
+    <renameHandler implementation="org.jetbrains.jet.plugin.refactoring.rename.RenameDynamicMemberHandler"/>
 
     <spellchecker.support implementationClass="org.jetbrains.jet.plugin.KotlinSpellcheckingStrategy" language="jet"/>
 
diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/rename/RenameDynamicMemberHandler.kt b/idea/src/org/jetbrains/jet/plugin/refactoring/rename/RenameDynamicMemberHandler.kt
new file mode 100644
index 00000000000..0d7fd26e5c5
--- /dev/null
+++ b/idea/src/org/jetbrains/jet/plugin/refactoring/rename/RenameDynamicMemberHandler.kt
@@ -0,0 +1,48 @@
+/*
+ * Copyright 2010-2014 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jetbrains.jet.plugin.refactoring.rename
+
+import com.intellij.refactoring.rename.inplace.VariableInplaceRenameHandler
+import com.intellij.psi.PsiElement
+import com.intellij.openapi.editor.Editor
+import com.intellij.psi.PsiFile
+import com.intellij.psi.util.PsiTreeUtil
+import org.jetbrains.jet.lang.psi.JetSimpleNameExpression
+import com.intellij.openapi.project.Project
+import com.intellij.openapi.actionSystem.DataContext
+import org.jetbrains.jet.plugin.codeInsight.CodeInsightUtils
+import org.jetbrains.jet.plugin.caches.resolve.analyze
+import org.jetbrains.jet.lang.resolve.BindingContext
+import org.jetbrains.jet.lang.resolve.calls.tasks.isDynamic
+
+public class RenameDynamicMemberHandler: VariableInplaceRenameHandler() {
+    override fun isAvailable(element: PsiElement?, editor: Editor, file: PsiFile): Boolean {
+        val callee = PsiTreeUtil.findElementOfClassAtOffset(
+                file, editor.getCaretModel().getOffset(), javaClass<JetSimpleNameExpression>(), false
+        ) ?: return false
+        val calleeDescriptor = callee.analyze()[BindingContext.REFERENCE_TARGET, callee] ?: return false
+        return calleeDescriptor.isDynamic()
+    }
+
+    override fun invoke(project: Project, editor: Editor, file: PsiFile, dataContext: DataContext?) {
+        CodeInsightUtils.showErrorHint(project, editor, "Rename is not applicable to dynamically invoked members", "Rename", null);
+    }
+
+    override fun invoke(project: Project, elements: Array<out PsiElement>, dataContext: DataContext?) {
+        // Do nothing: this method is called not from editor
+    }
+}