diff --git a/source/Ox.UI/js/Form/Ox.Editable.js b/source/Ox.UI/js/Form/Ox.Editable.js
index d348c81c..ed024fe1 100644
--- a/source/Ox.UI/js/Form/Ox.Editable.js
+++ b/source/Ox.UI/js/Form/Ox.Editable.js
@@ -158,7 +158,7 @@ Ox.Editable = function(options, self) {
             setTimeout(function() {
                 self.$input.focusInput(false);
             }, 0);
-            that.$tooltip.options({title: ''});
+            that.$tooltip && that.$tooltip.options({title: ''});
             that.triggerEvent('edit', {editing: true});
         }
     }
@@ -194,7 +194,7 @@ Ox.Editable = function(options, self) {
         self.$input.value(formatInputValue()).hide();
         self.$test.html(formatTestValue());
         self.$value.html(formatValue()).show();
-        that.$tooltip.options({title: self.options.tooltip});
+        that.$tooltip && that.$tooltip.options({title: self.options.tooltip});
         that.triggerEvent('submit', {
             value: self.options.value
         });