diff --git a/js/src/bootstrapMaterialDesign.js b/js/src/bootstrapMaterialDesign.js
index 903364b9..d1fb2a25 100644
--- a/js/src/bootstrapMaterialDesign.js
+++ b/js/src/bootstrapMaterialDesign.js
@@ -59,21 +59,21 @@ const BootstrapMaterialDesign = (($) => {
     checkboxInline: {
       selector: 'label.checkbox-inline > input[type=checkbox]'
     },
-    switch: {
-      selector: '.switch > label > input[type=checkbox]'
-    },
     radio: {
       selector: '.radio > label > input[type=radio]'
     },
     radioInline: {
       selector: 'label.radio-inline > input[type=radio]'
     },
-    textarea: {
-      selector: ['textarea']
-    },
     select: {
       selector: ['select']
     },
+    switch: {
+      selector: '.switch > label > input[type=checkbox]'
+    },
+    textarea: {
+      selector: ['textarea']
+    },
     autofill: {
       selector: 'body'
     },
diff --git a/js/src/select.js b/js/src/select.js
index 40233e6c..cdf3400d 100644
--- a/js/src/select.js
+++ b/js/src/select.js
@@ -31,6 +31,9 @@ const Select = (($) => {
 
     constructor($element, config) {
       super($element, $.extend(true, {invalidComponentMatches: [Checkbox, File, Radio, Switch, Text, Textarea]}, Default, config))
+
+      // floating labels will cover the options, so trigger them to be above (if used)
+      this.addIsFilled()
     }
 
     dispose() {