diff --git a/src/element/editable-element.js b/src/element/editable-element.js
index 69a1441..a49fae9 100644
--- a/src/element/editable-element.js
+++ b/src/element/editable-element.js
@@ -115,6 +115,9 @@ Makes editable any HTML element on the page. Applied as jQuery method.
            this.$element.on(this.options.toggle + '.editable', selector, $.proxy(function(e){
                var $target = $(e.target);
                if(!$target.data('editable')) {
+                   if($target.hasClass(this.options.emptyclass)) {
+                      $target.empty();
+                   }
                    $target.editable(this.options).trigger(e);
                }
            }, this));