diff --git a/source/UI/js/Form/Checkbox.js b/source/UI/js/Form/Checkbox.js
index 5261bb44..da94a77f 100644
--- a/source/UI/js/Form/Checkbox.js
+++ b/source/UI/js/Form/Checkbox.js
@@ -46,8 +46,9 @@ Ox.Checkbox = function(options, self) {
                         self.$button.options({value: 'remove'});
                     } else {
                         self.$button.options({values: ['none', 'check']});
-                        self.$button.options({value: self.options.value});
-                        self.$button.toggle();
+                        self.$button.options({
+                            value: self.options.value ? 'none' : 'check'
+                        });
                     }
                 },
                 label: function() {