diff --git a/Lib/modulefinder.py b/Lib/modulefinder.py
index 10320a74d94249..ec1ea06ceb3111 100644
--- a/Lib/modulefinder.py
+++ b/Lib/modulefinder.py
@@ -326,14 +326,14 @@ def _safe_import_hook(self, name, caller, fromlist, level=-1):
         else:
             if fromlist:
                 for sub in fromlist:
-                    if sub in self.badmodules:
-                        self._add_badmodule(sub, caller)
+                    fullname = name + "." + sub
+                    if fullname in self.badmodules:
+                        self._add_badmodule(fullname, caller)
                         continue
                     try:
                         self.import_hook(name, caller, [sub], level=level)
                     except ImportError as msg:
                         self.msg(2, "ImportError:", str(msg))
-                        fullname = name + "." + sub
                         self._add_badmodule(fullname, caller)
 
     def scan_opcodes(self, co):