diff --git a/jedi/api.py b/jedi/api.py
index 0babcd4c..0cba4f8d 100644
--- a/jedi/api.py
+++ b/jedi/api.py
@@ -382,7 +382,8 @@ class Script(object):
             if add_import_name:
                 import_name = user_stmt.get_defined_names()
                 # imports have only one name
-                if name_part == import_name[0].names[-1]:
+                if not user_stmt.star \
+                        and name_part == import_name[0].names[-1]:
                     definitions.append(import_name[0])
         else:
             stmt = self._get_under_cursor_stmt(goto_path)
diff --git a/test/completion/renaming.py b/test/completion/renaming.py
index 55ca5027..abbd1033 100644
--- a/test/completion/renaming.py
+++ b/test/completion/renaming.py
@@ -89,6 +89,9 @@ from import_tree.rename1 import abc
 #< (0, 32),
 from import_tree.rename1 import not_existing
 
+# shouldn't work
+#< 
+from not_existing import *
 
 # -----------------
 # classes