diff --git a/source/Ox.UI/js/Form/EditableContent.js b/source/Ox.UI/js/Form/EditableContent.js
index fa3595f5..7f611fd7 100644
--- a/source/Ox.UI/js/Form/EditableContent.js
+++ b/source/Ox.UI/js/Form/EditableContent.js
@@ -145,7 +145,10 @@ Ox.EditableContent = function(options, self) {
             }
             self.options.editing = true;
             that.gainFocus();
-            setTimeout(updateSelection, 50);
+            setTimeout(updateSelection);
+            that.triggerEvent('edit');
+        } else if (!self.options.editable) {
+            that.triggerEvent('open');
         }
     }
 
@@ -201,11 +204,10 @@ Ox.EditableContent = function(options, self) {
     }
 
     function updateSelection() {
-        var range, selection;
+        var range = document.createRange(),
+            selection = window.getSelection();
         that.$element[0].focus();
-        selection = window.getSelection();
         selection.removeAllRanges();
-        range = document.createRange();
         range.selectNodeContents(that.$element[0]);
         selection.addRange(range);
         setTimeout(function() {