diff --git a/js/widget.js b/js/widget.js
index 742ef87..69e5f05 100644
--- a/js/widget.js
+++ b/js/widget.js
@@ -21,7 +21,7 @@
       // .browser functionality. JQueryWTF.
       for (n in drupalSettings.CCKSelectOther) {
         for (i in drupalSettings.CCKSelectOther[n]) {
-          list_element = $('.' + drupalSettings.CCKSelectOther[n][i] + ' select');
+          list_element = $('[data-drupal-selector="' + drupalSettings.CCKSelectOther[n][i] + '"]');
           $(list_element).bind(actionBind, {element: list_element}, this.toggle).trigger(actionBind);
         }
       }
diff --git a/src/Plugin/Field/FieldWidget/SelectOtherWidget.php b/src/Plugin/Field/FieldWidget/SelectOtherWidget.php
index 1514114..aaf0877 100644
--- a/src/Plugin/Field/FieldWidget/SelectOtherWidget.php
+++ b/src/Plugin/Field/FieldWidget/SelectOtherWidget.php
@@ -67,7 +67,6 @@ class SelectOtherWidget extends OptionsWidgetBase {
 
     $defaults = $this->getDefaultValue($items, $element['#delta']);
     $field_item_name = str_replace('_', '-', $this->fieldDefinition->getName() . '-' . $element['#delta'] . '-select-other-list');
-    $element_class = 'form-item-' . $field_item_name;
 
     // Setup select other wrapper.
     $element += [
@@ -78,7 +77,7 @@ class SelectOtherWidget extends OptionsWidgetBase {
         'library' => ['cck_select_other/widget'],
         'drupalSettings' => [
           'CCKSelectOther' => [
-            $this->fieldDefinition->getName() => [$delta => $element_class],
+            $this->fieldDefinition->getName() => [$delta => 'edit-' . $field_item_name],
           ],
         ],
       ],