diff --git a/src/element/editable-element.js b/src/element/editable-element.js
index 6b54756..f570062 100644
--- a/src/element/editable-element.js
+++ b/src/element/editable-element.js
@@ -416,6 +416,8 @@ Makes editable any HTML element on the page. Applied as jQuery method.
         @method destroy()
         **/        
         destroy: function() {
+            this.disable();
+            
             if(this.container) {
                this.container.destroy(); 
             }
@@ -427,8 +429,7 @@ Makes editable any HTML element on the page. Applied as jQuery method.
             
             this.$element.off("save.internal");
             
-            this.$element.removeClass('editable');
-            this.$element.removeClass('editable-open');
+            this.$element.removeClass('editable editable-open editable-disabled');
             this.$element.removeData('editable');
         }        
     };
diff --git a/test/unit/api.js b/test/unit/api.js
index 16b6a31..1579b80 100644
--- a/test/unit/api.js
+++ b/test/unit/api.js
@@ -383,6 +383,7 @@ $(function () {
         e.click();
         var p = tip(e);
         ok(p.is(':visible'), 'container visible');
+        equal(e.text(), 'Empty', 'emptytext shown');
         
         e.editable('destroy');
         
@@ -392,9 +393,12 @@ $(function () {
         ok(!e.hasClass('editable'), 'editable class removed');
         ok(!e.hasClass('editable-click'), 'editable-click class removed');
         
+        equal(e.text(), '', 'emptytext removed');
+        
+        
+        
         e.click();
-        
-        
+                
      });                                 
   
 });