diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/AddInlineToFunctionWithReifiedFix.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/AddInlineToFunctionWithReifiedFix.kt
new file mode 100644
index 00000000000..942a929fd03
--- /dev/null
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/AddInlineToFunctionWithReifiedFix.kt
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2010-2016 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.kotlin.idea.quickfix
+
+import com.intellij.codeInsight.intention.IntentionAction
+import org.jetbrains.kotlin.diagnostics.Diagnostic
+import org.jetbrains.kotlin.diagnostics.Errors
+import org.jetbrains.kotlin.lexer.KtTokens
+import org.jetbrains.kotlin.psi.KtNamedFunction
+import org.jetbrains.kotlin.psi.psiUtil.getStrictParentOfType
+
+class AddInlineToFunctionWithReifiedFix(function: KtNamedFunction) : AddModifierFix(function, KtTokens.INLINE_KEYWORD) {
+    companion object Factory : KotlinSingleIntentionActionFactory() {
+        override fun createAction(diagnostic: Diagnostic): IntentionAction? {
+            val element = Errors.REIFIED_TYPE_PARAMETER_NO_INLINE.cast(diagnostic)
+            val function = element.psiElement.getStrictParentOfType<KtNamedFunction>() ?: return null
+            return AddInlineToFunctionWithReifiedFix(function)
+        }
+    }
+}
\ No newline at end of file
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/QuickFixRegistrar.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/QuickFixRegistrar.kt
index 77466a77608..62662602efe 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/QuickFixRegistrar.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/QuickFixRegistrar.kt
@@ -401,5 +401,7 @@ class QuickFixRegistrar : QuickFixContributor {
         UNUSED_LAMBDA_EXPRESSION.registerFactory(AddRunToLambdaFix)
 
         WRONG_LONG_SUFFIX.registerFactory(WrongLongSuffixFix)
+
+        REIFIED_TYPE_PARAMETER_NO_INLINE.registerFactory(AddInlineToFunctionWithReifiedFix)
     }
 }
diff --git a/idea/testData/quickfix/addInlineToReifiedFunctionFix/basic.kt b/idea/testData/quickfix/addInlineToReifiedFunctionFix/basic.kt
new file mode 100644
index 00000000000..1a614ff6c5e
--- /dev/null
+++ b/idea/testData/quickfix/addInlineToReifiedFunctionFix/basic.kt
@@ -0,0 +1,5 @@
+// "Add 'inline' modifier" "true"
+
+fun <<caret>reified T> fn() {
+
+}
\ No newline at end of file
diff --git a/idea/testData/quickfix/addInlineToReifiedFunctionFix/basic.kt.after b/idea/testData/quickfix/addInlineToReifiedFunctionFix/basic.kt.after
new file mode 100644
index 00000000000..d26d5efa1fc
--- /dev/null
+++ b/idea/testData/quickfix/addInlineToReifiedFunctionFix/basic.kt.after
@@ -0,0 +1,5 @@
+// "Add 'inline' modifier" "true"
+
+inline fun <reified T> fn() {
+
+}
\ No newline at end of file
diff --git a/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixTestGenerated.java
index 65102a1da3a..c1bccd30971 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixTestGenerated.java
+++ b/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixTestGenerated.java
@@ -383,6 +383,21 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
         }
     }
 
+    @TestMetadata("idea/testData/quickfix/addInlineToReifiedFunctionFix")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class AddInlineToReifiedFunctionFix extends AbstractQuickFixTest {
+        public void testAllFilesPresentInAddInlineToReifiedFunctionFix() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/addInlineToReifiedFunctionFix"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true);
+        }
+
+        @TestMetadata("basic.kt")
+        public void testBasic() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/addInlineToReifiedFunctionFix/basic.kt");
+            doTest(fileName);
+        }
+    }
+
     @TestMetadata("idea/testData/quickfix/addNoinline")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)