diff --git a/index.html b/index.html
index 10bea19..94a8f87 100644
--- a/index.html
+++ b/index.html
@@ -6,13 +6,15 @@
   <link href="demo/demo.css" media="screen" rel="stylesheet" type="text/css"/>
 
   <link href="src/DAT/GUI/gui.css" media="screen" rel="stylesheet"
-        type="text/css"
-      />
+        type="text/css"/>
+
   <script type="text/javascript" src="src/DAT/GUI/GUI.js"></script>
   <script type="text/javascript" src="src/DAT/GUI/Slider.js"></script>
   <script type="text/javascript" src="src/DAT/GUI/Controller.js"></script>
-  <script type="text/javascript" src="src/DAT/GUI/ControllerBoolean.js"></script>
-  <script type="text/javascript" src="src/DAT/GUI/ControllerFunction.js"></script>
+  <script type="text/javascript"
+          src="src/DAT/GUI/ControllerBoolean.js"></script>
+  <script type="text/javascript"
+          src="src/DAT/GUI/ControllerFunction.js"></script>
   <script type="text/javascript" src="src/DAT/GUI/ControllerNumber.js"></script>
   <script type="text/javascript" src="src/DAT/GUI/ControllerString.js"></script>
 
@@ -78,7 +80,8 @@
           var element;
           for (var i = 0; (element = allElements[i]) != null; i++) {
             var elementClass = element.className;
-            if (elementClass && elementClass.indexOf(className) != -1 && hasClassName.test(elementClass))
+            if (elementClass && elementClass.indexOf(className) != -1 &&
+                hasClassName.test(elementClass))
               results.push(element);
           }
 
diff --git a/src/DAT/GUI/Controller.js b/src/DAT/GUI/Controller.js
index 89f1e2f..f802b4f 100644
--- a/src/DAT/GUI/Controller.js
+++ b/src/DAT/GUI/Controller.js
@@ -76,6 +76,9 @@ DAT.GUI.Controller.prototype.options = function() {
       var opt = document.createElement('option');
       opt.innerHTML = i;
       opt.setAttribute('value', arr[i]);
+      if (arguments[i] == this.getValue()) {
+        opt.selected = true;
+      }
       select.appendChild(opt);
     }
   } else {
@@ -83,6 +86,9 @@ DAT.GUI.Controller.prototype.options = function() {
       var opt = document.createElement('option');
       opt.innerHTML = arguments[i];
       opt.setAttribute('value', arguments[i]);
+      if (arguments[i] == this.getValue()) {
+        opt.selected = true;
+      }
       select.appendChild(opt);
     }
   }