diff --git a/notebook/files/handlers.py b/notebook/files/handlers.py
index 25bc6cc77..1f02dd8d6 100644
--- a/notebook/files/handlers.py
+++ b/notebook/files/handlers.py
@@ -39,7 +39,7 @@ class FilesHandler(IPythonHandler):
         model = cm.get(path, type='file', content=include_body)
         
         if self.get_argument("download", False):
-            self.set_header('Content-Disposition','attachment; filename="%s"' % escape.urlescape(name))
+            self.set_header('Content-Disposition','attachment; filename="%s"' % escape.url_escape(name))
         
         # get mimetype from filename
         if name.endswith('.ipynb'):