diff --git a/python/src/com/jetbrains/python/psi/impl/PyFromImportStatementImpl.java b/python/src/com/jetbrains/python/psi/impl/PyFromImportStatementImpl.java
index 4f98700bfccf..45877d1cfd57 100644
--- a/python/src/com/jetbrains/python/psi/impl/PyFromImportStatementImpl.java
+++ b/python/src/com/jetbrains/python/psi/impl/PyFromImportStatementImpl.java
@@ -161,9 +161,13 @@ public class PyFromImportStatementImpl extends PyBaseElementImpl<PyFromImportSta
   public ASTNode addInternal(ASTNode first, ASTNode last, ASTNode anchor, Boolean before) {
     if (anchor == null) {
       // adding last element; the import may be "from ... import (...)", must get before the last ")"
-      PsiElement last_child = getLastChild();
-      if (last_child != null) {
-        ASTNode rpar_node = last_child.getNode();
+      PsiElement lastChild = getLastChild();
+      if (lastChild != null) {
+        while (lastChild instanceof PsiComment) {
+          lastChild = lastChild.getPrevSibling();
+          anchor = lastChild.getNode();
+        }
+        ASTNode rpar_node = lastChild.getNode();
         if (rpar_node != null && rpar_node.getElementType() == PyTokenTypes.RPAR) anchor = rpar_node;
       }
     }
diff --git a/python/testData/addImport/comment.after.py b/python/testData/addImport/comment.after.py
new file mode 100644
index 000000000000..777f4800b8fc
--- /dev/null
+++ b/python/testData/addImport/comment.after.py
@@ -0,0 +1 @@
+from urllib import urlopen, urlencode, unquote_plus   # this is a comment
\ No newline at end of file
diff --git a/python/testData/addImport/comment.py b/python/testData/addImport/comment.py
new file mode 100644
index 000000000000..5c223610e5ad
--- /dev/null
+++ b/python/testData/addImport/comment.py
@@ -0,0 +1 @@
+from urllib import urlopen, urlencode   # this is a comment
\ No newline at end of file
diff --git a/python/testSrc/com/jetbrains/python/PyAddImportTest.java b/python/testSrc/com/jetbrains/python/PyAddImportTest.java
index e8bc09255db0..a3c5fbff703e 100644
--- a/python/testSrc/com/jetbrains/python/PyAddImportTest.java
+++ b/python/testSrc/com/jetbrains/python/PyAddImportTest.java
@@ -20,14 +20,22 @@ public class PyAddImportTest extends PyTestCase {
     myFixture.checkResultByFile("addImport/addBuiltin.after.py");
   }
 
-  public void testImportInParens() {  // PY-7400
-    myFixture.configureByFile("addImport/parens.py");
+  public void testParens() {  // PY-7400
+    doAddImportFrom("urllib", "unquote_plus");
+  }
+
+  public void testComment() {  // PY-8034
+    doAddImportFrom("urllib", "unquote_plus");
+  }
+
+  private void doAddImportFrom(final String path, final String name) {
+    myFixture.configureByFile("addImport/" + getTestName(true) + ".py");
     new WriteCommandAction(myFixture.getProject(), myFixture.getFile()) {
       @Override
       protected void run(Result result) throws Throwable {
-        AddImportHelper.addImportFrom(myFixture.getFile(), null, "urllib", "unquote_plus", null, AddImportHelper.ImportPriority.BUILTIN);
+        AddImportHelper.addImportFrom(myFixture.getFile(), null, path, name, null, AddImportHelper.ImportPriority.BUILTIN);
       }
     }.execute();
-    myFixture.checkResultByFile("addImport/parens.after.py");
+    myFixture.checkResultByFile("addImport/" + getTestName(true) + ".after.py");
   }
 }
diff --git a/python/testSrc/com/jetbrains/python/PythonAllTestsSuite.java b/python/testSrc/com/jetbrains/python/PythonAllTestsSuite.java
index a612edb362b5..78950a0aa6ab 100644
--- a/python/testSrc/com/jetbrains/python/PythonAllTestsSuite.java
+++ b/python/testSrc/com/jetbrains/python/PythonAllTestsSuite.java
@@ -106,7 +106,8 @@ public class PythonAllTestsSuite {
     PyStatementListTest.class,
     PyChangeSignatureTest.class,
     PyCommenterTest.class,
-    PyRegexpTest.class
+    PyRegexpTest.class,
+    PyAddImportTest.class
   };
 
   public static TestSuite suite() {