diff --git a/html/config.html b/html/config.html
index 024b8f8e..4fb5d37b 100644
--- a/html/config.html
+++ b/html/config.html
@@ -4,6 +4,7 @@
     <li><input type="password" class="form-control" placeholder="password" id="password" value="{{ password }}" title="Password"></input></li>
     <li><input type="checkbox" id="diff" {{ diff }} ></input> <label for="diff">Diff</label></li>
     <li><input type="checkbox" id="zip" {{ zip }} ></input> <label for="zip">Zip</label></li>
+    <li><select class="form-control" id="editor" title="Editor"><option {{ edward-selected }}>edward</option><option {{ dword-selected }}>dword</option></select></li>
     <li><input type="checkbox" id="notifications" {{ notifications }} ></input> <label for="notifications">Notifications</label></li>
     <li><input type="checkbox" id="localStorage" {{ localStorage }} ></input> <label for="localStorage">Local Storage</label></li>
     <li><input type="checkbox" id="buffer" {{ buffer }} ></input> <label for="buffer">Buffer</label></li>
diff --git a/lib/client/config.js b/lib/client/config.js
index f18899ff..2f6ee94e 100644
--- a/lib/client/config.js
+++ b/lib/client/config.js
@@ -105,6 +105,10 @@ var CloudCmd, Util, DOM, io;
                 CONFIG  = config;
                 obj     = Util.copyObj(CONFIG);
                 changeConfig(obj);
+                
+                obj[obj.editor + '-selected'] = 'selected';
+                delete obj.editor;
+                
                 data    = Util.render(Template, obj);
                 div     = DOM.load({
                     name        : 'div',
@@ -117,7 +121,7 @@ var CloudCmd, Util, DOM, io;
                 
                 Element = div;
                 
-                inputs      = DOM.getByTag(INPUT, div);
+                inputs      = document.querySelectorAll('input, select', div);
                 inputFirst  = inputs[0];
                 
                 if (inputFirst) {