diff --git a/lib/client/config.js b/lib/client/config.js
index 776d8b15..c3592906 100644
--- a/lib/client/config.js
+++ b/lib/client/config.js
@@ -84,7 +84,10 @@ var CloudCmd, Util, DOM;
                 
                 Util.forEach(inputs, function(input) {
                     Events.add('change', input, onChange)
-                          .addKey(input, onKey);
+                          .addKey(input, onKey)
+                          .addClick(input, function(event) {
+                              event.preventDefault();
+                          });
                 });
                 
                 CloudCmd.View.show(div, {
@@ -148,6 +151,7 @@ var CloudCmd, Util, DOM;
             Config.write(obj, function() {
                 CONFIG[name] = data;
                 DOM.Files.set('config', CONFIG);
+                setValue(el, data);
             });
         }
         
@@ -171,6 +175,20 @@ var CloudCmd, Util, DOM;
             return data;
         }
         
+        function setValue(el, value) {
+            var type    = el.type;
+            
+            switch(type) {
+            case 'checkbox':
+                el.checked = value;
+                break;
+            
+            default:
+                el.value    = value;
+                break;
+            }
+        }
+        
         function onLocalStorageChange(checked) {
             var elDiff          = DOM.getById('diff', Element),
                 elBuffer        = DOM.getById('buffer', Element),