diff --git a/app/controllers/collections/detail/edit.js b/app/controllers/collections/detail/edit.js
index 205a4aa..df9f0ee 100644
--- a/app/controllers/collections/detail/edit.js
+++ b/app/controllers/collections/detail/edit.js
@@ -12,6 +12,7 @@ export default Controller.extend(ValidationMixin, {
   DatasheetValidations,
 
   hasMany: ['collectionSpecies', 'datasheets'],
+  safeNavigate: false,
 
   options: computed('projectOptions', 'studyLocationOptions',
                     'collectionTypeOptions', 'collectionMethodOptions',
@@ -29,15 +30,21 @@ export default Controller.extend(ValidationMixin, {
   actions: {
     onSave(changesets) {
       const postSave = () => {
+        this.set('safeNavigate', true);
         // Use the model's ID here because of the ArrayProxy in the route
         this.transitionToRoute('collections.detail', this.get('model.id'));
+        this.set('safeNavigate', false);
+        console.log('save');
       };
       return this.validationSave(changesets, postSave);
     },
     onCancel(changesets) {
       const postCancel = () => {
+        this.set('safeNavigate', true);
         // Use the model's ID here because of the ArrayProxy in the route
-        return this.transitionToRoute('collections.detail', this.get('model.id'));
+        this.transitionToRoute('collections.detail', this.get('model.id'));
+        this.set('safeNavigate', false);
+        console.log('cancel');
       };
       return this.validationCancel(changesets, postCancel);
     },
diff --git a/app/mixins/cleanup-form.js b/app/mixins/cleanup-form.js
index ec83827..fdf1032 100644
--- a/app/mixins/cleanup-form.js
+++ b/app/mixins/cleanup-form.js
@@ -5,28 +5,32 @@ const { Mixin, run: { once } } = Ember;
 export default Mixin.create({
   actions: {
     willTransition(transition) {
-      if (confirm('Any unsaved changes will be discarded.')) {
-        let model = this.get('controller.model');
-        let hasMany = this.get('controller.hasMany');
+      if (!this.get('controller.safeNavigate')) {
+        if (confirm('Any unsaved changes will be discarded.')) {
+          let model = this.get('controller.model');
+          let hasMany = this.get('controller.hasMany');
 
-        hasMany.forEach((relationship) => {
-          model.get(relationship).forEach((r) => {
-            once(this, () => {
-              if (r.get('isNew')) {
-                r.deleteRecord();
-              } else {
-                r.rollbackAttributes();
-              }
-            }, this);
+          hasMany.forEach((relationship) => {
+            model.get(relationship).forEach((r) => {
+              once(this, () => {
+                if (r.get('isNew')) {
+                  r.deleteRecord();
+                } else {
+                  r.rollbackAttributes();
+                }
+              }, this);
+            });
           });
-        });
 
-        if (model.get('isNew')) {
-          model.deleteRecord();
+          if (model.get('isNew')) {
+            model.deleteRecord();
+          }
+        } else {
+          transition.abort();
+          return false
         }
-      } else {
-        return false;
       }
+      return true;
     },
   },
 });
diff --git a/config/environment.js b/config/environment.js
index 6132d43..abd9a84 100644
--- a/config/environment.js
+++ b/config/environment.js
@@ -26,6 +26,7 @@ module.exports = function(environment) {
   if (environment === 'development') {
     ENV.APP.API_HOST = 'http://localhost:8000';
     ENV.APP.API_NAMESPACE = 'api/v1';
+    ENV.APP.LOG_TRANSITIONS = true;
   }
 
   if (environment === 'test') {