diff --git a/client/components/Nav.jsx b/client/components/Nav.jsx
index f8f19848..87740c7f 100644
--- a/client/components/Nav.jsx
+++ b/client/components/Nav.jsx
@@ -167,6 +167,7 @@ class Nav extends React.PureComponent {
               <li className="nav__dropdown-item">
                 <button
                   onClick={() => {
+                    this.props.autosaveProject();
                     this.props.exportProjectAsZip(this.props.project.id);
                     this.setDropdown('none');
                   }}
@@ -487,6 +488,7 @@ class Nav extends React.PureComponent {
 Nav.propTypes = {
   newProject: PropTypes.func.isRequired,
   saveProject: PropTypes.func.isRequired,
+  autosaveProject: PropTypes.func.isRequired,
   exportProjectAsZip: PropTypes.func.isRequired,
   cloneProject: PropTypes.func.isRequired,
   user: PropTypes.shape({
diff --git a/client/modules/IDE/pages/IDEView.jsx b/client/modules/IDE/pages/IDEView.jsx
index eb34660e..b7f6a511 100644
--- a/client/modules/IDE/pages/IDEView.jsx
+++ b/client/modules/IDE/pages/IDEView.jsx
@@ -208,6 +208,7 @@ class IDEView extends React.Component {
           user={this.props.user}
           newProject={this.props.newProject}
           saveProject={this.props.saveProject}
+          autosaveProject={this.props.autosaveProject}
           exportProjectAsZip={this.props.exportProjectAsZip}
           cloneProject={this.props.cloneProject}
           project={this.props.project}
diff --git a/server/controllers/project.controller.js b/server/controllers/project.controller.js
index df1397a5..8cb16a5f 100644
--- a/server/controllers/project.controller.js
+++ b/server/controllers/project.controller.js
@@ -2,6 +2,7 @@ import archiver from 'archiver';
 import request from 'request';
 import moment from 'moment';
 import isUrl from 'is-url';
+import slugify from 'slugify';
 import jsdom, { serializeDocument } from 'jsdom';
 import Project from '../models/project';
 import User from '../models/user';
@@ -261,7 +262,9 @@ function buildZip(project, req, res) {
     res.status(500).send({ error: err.message });
   });
 
-  res.attachment(`${project.name}.zip`);
+  const currentTime = moment().format('YYYY_MM_DD_HH_mm_ss');
+  project.slug = slugify(project.name, '_');
+  res.attachment(`${project.slug}_${currentTime}.zip`);
   zip.pipe(res);
 
   function addFileToZip(file, path) {