diff --git a/app/subnets/addresses/address-modify.php b/app/subnets/addresses/address-modify.php
index 2ddfcad..af3afca 100644
--- a/app/subnets/addresses/address-modify.php
+++ b/app/subnets/addresses/address-modify.php
@@ -300,7 +300,7 @@ function validate_mac (ip, mac, sectionId, vlanId, id) {
                print ' <td>'._('Device').'</td>'. "\n";
                print ' <td>'. "\n";

-               print '<select name="switch" class="ip_addr form-control input-sm input-w-auto" '.$delete.'>'. "\n";
+               print '<select name="switch" data-live-search="true" class="ip_addr form-control input-sm input-w-auto selectpicker" '.$delete.'>'. "\n";
                print '<option disabled>'._('Select device').':</option>'. "\n";
                print '<option value="0" selected>'._('None').'</option>'. "\n";

@@ -328,7 +328,7 @@ function validate_mac (ip, mac, sectionId, vlanId, id) {
        <tr>
                <td><?php print _('Location'); ?></td>
                <td>
-                       <select name="location_item" class="form-control input-sm input-w-auto">
+                       <select name="location_item" data-live-search="true" class="form-control input-sm input-w-auto selectpicker">
                        <option value="0"><?php print _("None"); ?></option>
                        <?php
                 if($locations!==false) {
diff --git a/index.php b/index.php
index f777b70..cc60db7 100755
--- a/index.php
+++ b/index.php
@@ -114,6 +114,9 @@ else {
        <script src="js/<?php print SCRIPT_PREFIX; ?>/bootstrap-table/bootstrap-table.min.js"></script>
        <script src="js/<?php print SCRIPT_PREFIX; ?>/bootstrap-table/bootstrap-table-cookie.js"></script>

+       <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-select/1.12.4/css/bootstrap-select.min.css">
+       <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-select/1.12.4/js/bootstrap-select.min.js"></script>
+
        <script type="text/javascript">
        $(document).ready(function(){
             if ($("[rel=tooltip]").length) { $("[rel=tooltip]").tooltip(); }
diff --git a/js/1.3.1/magic.js b/js/1.3.1/magic.js
index 34882c2..584316a 100755
--- a/js/1.3.1/magic.js
+++ b/js/1.3.1/magic.js
@@ -552,6 +552,7 @@ $(document).on("click", ".modIPaddr", function() {
         $('#popupOverlay div.popup_w500').html(data);
         showPopup('popup_w500');
         hideSpinner();
+       $('.selectpicker').selectpicker('refresh');
     }).fail(function(jqxhr, textStatus, errorThrown) { showError(jqxhr.statusText + "<br>Status: " + textStatus + "<br>Error: "+errorThrown); });
     return false;
 });