1 files changed, 9 insertions, 1 deletions
diff --git a/public/assets/javascripts/ui/editor/TextEditor.js b/public/assets/javascripts/ui/editor/TextEditor.js
index 51077af..2949943 100644
--- a/public/assets/javascripts/ui/editor/TextEditor.js
+++ b/public/assets/javascripts/ui/editor/TextEditor.js
@@ -25,6 +25,11 @@ var TextEditor = FormView.extend({
     this.$fontSize = this.$("[name=font-size]")
     this.$textBody = this.$("[name=text-body]")
     this.$textAlign = this.$("[name=text-align]")
+    
+    app.on("cancel-scenery", function(){
+      this.createMode(true)
+      $("body").toggleClass("addText", false)
+    }.bind(this))
 	},
 
   toggle: function(state){
@@ -70,11 +75,13 @@ var TextEditor = FormView.extend({
       if (this.tainted) {
         Minotaur.watch( app.router.editorView.settings )
       }
-
 	    if (this.scenery.mx) {
         this.scenery.mx.bound = false
         this.scenery.mx.el.classList.remove("picked")
       }
+      if (! this.scenery.media || ! this.scenery.media.description || this.scenery.media.description == "") {
+        this.scenery.remove()
+      }
     }
     this.tainted = false
     this.scenery = null
@@ -138,6 +145,7 @@ var TextEditor = FormView.extend({
 	destroy: function(){
     this.tainted = false
     this.scenery.remove()
+    this.hide()
 	},
 
 })