diff --git a/source/Ox.UI/js/Form/EditableContent.js b/source/Ox.UI/js/Form/EditableContent.js
index 66c7e03a..b63e2c93 100644
--- a/source/Ox.UI/js/Form/EditableContent.js
+++ b/source/Ox.UI/js/Form/EditableContent.js
@@ -78,10 +78,15 @@ Ox.EditableContent = function(options, self) {
 
     function edit() {
         if (self.options.editable && !self.editing) {
+            var value = formatInputValue();
             self.$value
-                .text(formatInputValue() || ' ')
                 .addClass('OxEditableContentInput')
                 .attr({contenteditable: true});
+            if (value) {
+                self.$value.text(value);
+            } else {
+                self.$value.html(' ');
+            }
             self.editing = true;
             that.gainFocus();
             setTimeout(updateSelection, 50);