diff --git a/client/modules/IDE/actions/project.js b/client/modules/IDE/actions/project.js
index b3da6819..8d1c6383 100644
--- a/client/modules/IDE/actions/project.js
+++ b/client/modules/IDE/actions/project.js
@@ -262,7 +262,7 @@ function generateNewIdsForChildren(file, files) {
 export function cloneProject(id) {
   return (dispatch, getState) => {
     dispatch(setUnsavedChanges(false));
-    new Promise((resolve, reject) => {
+    return new Promise((resolve, reject) => {
       if (!id) {
         resolve(getState());
       } else {
diff --git a/client/modules/IDE/components/Toolbar.jsx b/client/modules/IDE/components/Toolbar.jsx
index 1af979cc..29572cb8 100644
--- a/client/modules/IDE/components/Toolbar.jsx
+++ b/client/modules/IDE/components/Toolbar.jsx
@@ -58,11 +58,14 @@ class Toolbar extends React.Component {
   }
 
   render() {
+    const canEditProjectName = this.canEditProjectName();
+
     const playButtonClass = classNames({
       'toolbar__play-button': true,
       'toolbar__play-button--selected': this.props.isPlaying,
       'toolbar__play-button--saved': this.props.isSaved,
-      'toolbar__play-button--unsaved': !this.props.isSaved
+      'toolbar__play-button--unsaved': !this.props.isSaved,
+      'toolbar__play-button--clone': this.props.unsavedChanges && !canEditProjectName
     });
     const stopButtonClass = classNames({
       'toolbar__stop-button': true,
@@ -77,8 +80,6 @@ class Toolbar extends React.Component {
       'toolbar__project-name-container--editing': this.props.project.isEditingName
     });
 
-    const canEditProjectName = this.canEditProjectName();
-
     return (
       <div className="toolbar">
         <button
@@ -178,6 +179,7 @@ class Toolbar extends React.Component {
 
 Toolbar.propTypes = {
   isPlaying: PropTypes.bool.isRequired,
+  unsavedChanges: PropTypes.bool.isRequired,
   isSaved: PropTypes.bool.isRequired,
   preferencesIsVisible: PropTypes.bool.isRequired,
   stopSketch: PropTypes.func.isRequired,
@@ -221,6 +223,7 @@ function mapStateToProps(state) {
     isSaved: state.project.updatedAt !== '',
     preferencesIsVisible: state.ide.preferencesIsVisible,
     project: state.project,
+    unsavedChanges: state.ide.unsavedChanges,
   };
 }
 
diff --git a/client/modules/IDE/pages/IDEView.jsx b/client/modules/IDE/pages/IDEView.jsx
index c4e91e01..f72537ca 100644
--- a/client/modules/IDE/pages/IDEView.jsx
+++ b/client/modules/IDE/pages/IDEView.jsx
@@ -183,6 +183,7 @@ class IDEView extends React.Component {
       console.trace('project to save:', this.props.project);
       return this.props.saveProject(this.cmController.getContent());
     } else if (this.props.user.authenticated) {
+      console.log('cloning!');
       return this.props.cloneProject();
     }
 
diff --git a/client/styles/components/_toolbar.scss b/client/styles/components/_toolbar.scss
index 3d164e3d..5d974bb5 100644
--- a/client/styles/components/_toolbar.scss
+++ b/client/styles/components/_toolbar.scss
@@ -1,5 +1,5 @@
 .toolbar__play-button {
-	&--unsaved {
+	&--unsaved, &--clone {
 		// for some reason, I cannot manage to have PreviewFrame save _and_ actuall yload the project (it stops the playback)
 		// pressing twice works. So just show a floppy the first time around :-)
 		svg {