diff --git a/src/Resources/Views.Home.Inventory.de.resx b/src/Resources/Views.Home.Inventory.de.resx
index 4d6ef1f..280983c 100644
--- a/src/Resources/Views.Home.Inventory.de.resx
+++ b/src/Resources/Views.Home.Inventory.de.resx
@@ -138,4 +138,10 @@
     <data name="Asset updated successfully" xml:space="preserve">
         <value>Asset wurde erfolgreich angepasst</value>
     </data>
+    <data name="Select user" xml:space="preserve">
+        <value>Benutzer auswählen</value>
+    </data>
+    <data name="Select location" xml:space="preserve">
+        <value>Ort auswählen</value>
+    </data>
 </root>
diff --git a/src/Resources/Views.Shared._Layout.de.resx b/src/Resources/Views.Shared._Layout.de.resx
index 0ed21de..54a4121 100644
--- a/src/Resources/Views.Shared._Layout.de.resx
+++ b/src/Resources/Views.Shared._Layout.de.resx
@@ -43,4 +43,7 @@
     <data name="Error loading locations" xml:space="preserve">
         <value>Fehler beim Laden der Orte</value>
     </data>
+    <data name="Select user" xml:space="preserve">
+        <value>Benutzer auswählen</value>
+    </data>
 </root>
diff --git a/src/Views/Home/Assets.cshtml b/src/Views/Home/Assets.cshtml
index 2d94e58..0048a4a 100644
--- a/src/Views/Home/Assets.cshtml
+++ b/src/Views/Home/Assets.cshtml
@@ -495,9 +495,11 @@ document.addEventListener('DOMContentLoaded', () => {
             const asset = responseJson.assetsModel;
             
             const locationSelect = updateForm.querySelector('#updateLocationSelect');
-            await loadLocationsIntoSelect(locationSelect, asset.Location);
             const usersSelect = updateForm.querySelector('#updateUsersSelect');
-            await loadUsersIntoSelect(usersSelect, asset.Owner);
+            await Promise.all([
+                loadLocationsIntoSelect(locationSelect, asset.Location),
+                loadUsersIntoSelect(usersSelect, asset.Owner)
+            ]);
 
             for (const [key, value] of Object.entries(asset)) {
                 const input = updateForm.querySelector(`[name="${key}"]`);
diff --git a/src/Views/Home/Inventory.cshtml b/src/Views/Home/Inventory.cshtml
index d1e339d..6ddd1da 100644
--- a/src/Views/Home/Inventory.cshtml
+++ b/src/Views/Home/Inventory.cshtml
@@ -5,6 +5,8 @@
 @{
     ViewData["Title"] = T["Inventory"];
 }
+<link href="https://cdn.jsdelivr.net/npm/tom-select/dist/css/tom-select.bootstrap5.min.css" rel="preload" as="style" onload="this.onload=null;this.rel='stylesheet'"/>
+<script src="https://cdn.jsdelivr.net/npm/tom-select/dist/js/tom-select.complete.min.js" defer></script>
 
 <partial name="_BatchButton"/>
 
@@ -309,11 +311,15 @@
 
                         <div class="col-md-6">
                             <label class="form-label">@T["Location"]</label>
-                            <input type="text" class="form-control" name="Location" />
+                            <select class="form-select" name="Location" id="updateLocationSelect">
+                                <option value="">@T["Select location"]</option>
+                            </select>
                         </div>
                         <div class="col-md-6">
                             <label class="form-label">@T["Owner"]</label>
-                            <input type="text" class="form-control" name="Owner" />
+                            <select class="form-select" name="Owner" id="updateUsersSelect">
+                                <option value="">@T["Select owner"]</option>
+                            </select>
                         </div>
 
                         <div class="col-md-6">
@@ -416,7 +422,14 @@ document.addEventListener('DOMContentLoaded', () => {
             const response = await fetch(`/Assets/Get?cn=${assetId}`);
             const responseJson = await response.json();
             const asset = responseJson.assetsModel;
-            
+
+            const locationSelect = updateForm.querySelector('#updateLocationSelect');
+            const usersSelect = updateForm.querySelector('#updateUsersSelect');
+            await Promise.all([
+                loadLocationsIntoSelect(locationSelect, asset.Location),
+                loadUsersIntoSelect(usersSelect, asset.Owner)
+            ]);
+
             for (const [key, value] of Object.entries(asset)) {
                 const input = updateForm.querySelector(`[name="${key}"]`);
                 if (input) input.value = value;
@@ -518,5 +531,56 @@ document.addEventListener('DOMContentLoaded', () => {
 });
 </script>
 
+<!-- TomSelect dropdowns -->
+<script>
+    // Locations dropdowns
+    document.addEventListener('DOMContentLoaded', () => {
+        const updateLocationSelect = document.getElementById('updateLocationSelect');
+
+        async function initLocationSelect(selectElement) {
+            if (!selectElement) return;
+            await loadLocationsIntoSelect(selectElement);
+            new TomSelect(selectElement, {
+                plugins: ['clear_button'],
+                create: false,
+                sortField: { field: 'text', direction: 'asc' },
+                placeholder: '@T["Select location"]',
+                maxOptions: 500, // avoid performance hit if there are many
+                render: {
+                    no_results: function(data, escape) {
+                        return `<div class="no-results">@T["No locations found"]</div>`;
+                    }
+                }
+            });
+        }
+
+        initLocationSelect(updateLocationSelect);
+        
+        // Users dropdowns
+        const updateUsersSelect = document.getElementById('updateUsersSelect');
+
+        async function initUsersSelect(selectElement) {
+            if (!selectElement) return;
+            await loadUsersIntoSelect(selectElement);
+            new TomSelect(selectElement, {
+                plugins: ['clear_button'],
+                create: false,
+                sortField: { field: 'text', direction: 'asc' },
+                placeholder: '@T["Select user"]',
+                maxOptions: 500, // avoid performance hit if there are many
+                render: {
+                    no_results: function(data, escape) {
+                        return `<div class="no-results">@T["No users found"]</div>`;
+                    }
+                }
+            });
+        }
+
+        initUsersSelect(updateUsersSelect);
+    });
+
+</script>
+
+
 
 <partial name="_Batch"/>
\ No newline at end of file