diff --git a/src/scripts/components/select.js b/src/scripts/components/select.js
index 7cfd71e..919387a 100644
--- a/src/scripts/components/select.js
+++ b/src/scripts/components/select.js
@@ -15,8 +15,10 @@ module.exports = {
 
     var $value = self.$element.select('.value');
 
-    self.on('change', function(ev) {
-      var value = self.$manipulatorTarget.select('option:checked').get('innerHTML');
+    self.on('change', function() {
+      var selectedIndex = self.$manipulatorTarget.get('selectedIndex');
+      var $options = self.$manipulatorTarget.select('option');
+      var value = $options[selectedIndex] && $options[selectedIndex].innerHTML;
       $value.set('innerHTML', value);
     });
   }
diff --git a/src/styles/clay/components/select.scss b/src/styles/clay/components/select.scss
index 1b43d93..ca256b5 100644
--- a/src/styles/clay/components/select.scss
+++ b/src/styles/clay/components/select.scss
@@ -8,6 +8,7 @@
     $triangle-size: 0.85rem;
     position: relative;
     padding-right: $triangle-size + 0.25rem;
+    display: block;
 
     &:after {
       content: "";