diff --git a/PIL/Image.py b/PIL/Image.py
index 2f304a9a8..53e774639 100644
--- a/PIL/Image.py
+++ b/PIL/Image.py
@@ -2244,10 +2244,15 @@ def open(fp, mode="r"):
 
     if isPath(fp):
         filename = fp
-        fp = builtins.open(fp, "rb")
+        with builtins.open(fp, "rb") as fp:
+            return _open(fp, filename, mode)
     else:
         filename = ""
+        return _open(fp, filename, mode)
 
+
+
+def _open(fp, filename, mode):
     prefix = fp.read(16)
 
     preinit()