diff --git a/source/UI/js/Form/Checkbox.js b/source/UI/js/Form/Checkbox.js
index 9bc49de8..89cb1d13 100644
--- a/source/UI/js/Form/Checkbox.js
+++ b/source/UI/js/Form/Checkbox.js
@@ -44,6 +44,7 @@ Ox.Checkbox = function(options, self) {
                     if (self.options.indeterminate) {
                         self.$button.options({value: 'minus'});
                     } else {
+                        self.$button.options({values: ['none', 'check']});
                         self.$button.toggle();
                     }
                 },
@@ -107,7 +108,7 @@ Ox.Checkbox = function(options, self) {
             type: 'image',
             value: self.options.indeterminate ? 'minus'
                 : self.options.value ? 'check' : 'none',
-            values: ['none', 'check']
+            values: self.options.indeterminate ? null : ['none', 'check']
         })
         .addClass('OxCheckbox')
         .bindEvent({