diff --git a/python/src/com/jetbrains/python/actions/TransformClassicClassQuickFix.java b/python/src/com/jetbrains/python/actions/TransformClassicClassQuickFix.java
index 68251120da4f..7a5a45ccad66 100644
--- a/python/src/com/jetbrains/python/actions/TransformClassicClassQuickFix.java
+++ b/python/src/com/jetbrains/python/actions/TransformClassicClassQuickFix.java
@@ -4,9 +4,9 @@ import com.intellij.codeInspection.LocalQuickFix;
 import com.intellij.codeInspection.ProblemDescriptor;
 import com.intellij.openapi.project.Project;
 import com.intellij.psi.PsiElement;
+import com.intellij.psi.util.PsiTreeUtil;
 import com.jetbrains.python.PyBundle;
 import com.jetbrains.python.PyNames;
-import com.jetbrains.python.PythonLanguage;
 import com.jetbrains.python.psi.PyClass;
 import com.jetbrains.python.psi.PyElementGenerator;
 import com.jetbrains.python.psi.PyExpression;
@@ -31,7 +31,8 @@ public class TransformClassicClassQuickFix implements LocalQuickFix {
 
   public void applyFix(@NotNull Project project, @NotNull ProblemDescriptor descriptor) {
     PsiElement psiElement = descriptor.getPsiElement();
-    if (psiElement instanceof PyClass) {
+    psiElement = PsiTreeUtil.getParentOfType(psiElement, PyClass.class);
+    if (psiElement != null) {
       PyClass pyClass = (PyClass) psiElement;
       PyExpression[] superClassExpressions = pyClass.getSuperClassExpressions();
       PyElementGenerator generator = PyElementGenerator.getInstance(project);
diff --git a/python/testData/inspections/TransformClassicClass.py b/python/testData/inspections/TransformClassicClass.py
index 492d098bcda8..5548b114394a 100644
--- a/python/testData/inspections/TransformClassicClass.py
+++ b/python/testData/inspections/TransformClassicClass.py
@@ -1,6 +1,6 @@
-<caret><warning descr="Old-style class">class A:
+class <warning descr="Old-style class"><caret>A</warning>:
     def foo(self):
         pass
 
     def bar(self):
-        pass</warning>
\ No newline at end of file
+        pass
\ No newline at end of file