diff --git a/src/Resources/Views.Shared._Layout.de.resx b/src/Resources/Views.Shared._Layout.de.resx
index f310ed3..0ed21de 100644
--- a/src/Resources/Views.Shared._Layout.de.resx
+++ b/src/Resources/Views.Shared._Layout.de.resx
@@ -37,4 +37,10 @@
     <data name="Login" xml:space="preserve">
         <value>Anmelden</value>
     </data>
+    <data name="Select location" xml:space="preserve">
+        <value>Ort auswählen</value>
+    </data>
+    <data name="Error loading locations" xml:space="preserve">
+        <value>Fehler beim Laden der Orte</value>
+    </data>
 </root>
diff --git a/src/Views/Home/Assets.cshtml b/src/Views/Home/Assets.cshtml
index ec812a3..11ef9d9 100644
--- a/src/Views/Home/Assets.cshtml
+++ b/src/Views/Home/Assets.cshtml
@@ -171,7 +171,9 @@
 
                         <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="createLocationSelect">
+                                <option value="">@T["Select location"]</option>
+                            </select>
                         </div>
                         <div class="col-md-6">
                             <label class="form-label">@T["Owner"]</label>
@@ -373,7 +375,6 @@
             <form id="updateAssetForm">
                 <div class="modal-body">
                     <div class="row g-3">
-                        <!-- Same fields as in Create -->
                         <div class="col-md-6">
                             <label class="form-label">@T["Name"]</label>
                             <input type="text" class="form-control" name="Name" />
@@ -381,7 +382,9 @@
 
                         <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>
@@ -482,7 +485,8 @@ document.addEventListener('DOMContentLoaded', () => {
 
         updateAttributesContainer.innerHTML = '';
         updateForm.reset();
-
+        const locationSelect = updateForm.querySelector('#updateLocationSelect');
+        await loadLocationsIntoSelect(locationSelect);
         try {
             const response = await fetch(`/Assets/Get?cn=${assetId}`);
             const responseJson = await response.json();
@@ -754,6 +758,15 @@ document.addEventListener('DOMContentLoaded', () => {
         });
     });
 });
+
+document.addEventListener('DOMContentLoaded', () => {
+    const createModal = document.getElementById('createAssetModal');
+    createModal.addEventListener('show.bs.modal', async () => {
+        const select = createModal.querySelector('#createLocationSelect');
+        await loadLocationsIntoSelect(select);
+    });
+});
+
 </script>
 
 <partial name="_Batch"/>
\ No newline at end of file
diff --git a/src/Views/Shared/_Layout.cshtml b/src/Views/Shared/_Layout.cshtml
index 3ef20ce..0611bc7 100644
--- a/src/Views/Shared/_Layout.cshtml
+++ b/src/Views/Shared/_Layout.cshtml
@@ -17,6 +17,12 @@
     <link rel="preload" href="~/css/site.css" as="style" onload="this.onload=null;this.rel='stylesheet'">
     <noscript><link rel="stylesheet" href="~/css/site.css"></noscript>
     <link rel="stylesheet" href="~/Berufsschule_HAM.styles.css" asp-append-version="true" />
+    <script>
+        window.appTranslations = {
+            selectLocation: '@T["Select location"]',
+            errorLoading: '@T["Error loading locations"]'
+        };
+    </script>
 </head>
 <body data-bs-theme="dark">
     <script>
diff --git a/src/wwwroot/js/site.js b/src/wwwroot/js/site.js
index 209386b..15d9a89 100644
--- a/src/wwwroot/js/site.js
+++ b/src/wwwroot/js/site.js
@@ -116,3 +116,27 @@ document.addEventListener('DOMContentLoaded', () => {
         });
     });
 });
+
+
+async function loadLocationsIntoSelect(selectElement, selectedValue = null) {
+    try {
+        const response = await fetch('/Locations/Index');
+        const locations = await response.json();
+
+        selectElement.innerHTML = `<option value="">${appTranslations.selectLocation}</option>`;
+
+        locations.forEach(loc => {
+            const text = `${loc.description.Location}, Room ${loc.description.RoomNumber}, Seat ${loc.description.Seat}`;
+            const option = document.createElement('option');
+            option.value = loc.location;
+            option.textContent = text;
+            if (selectedValue && selectedValue === loc.location) {
+                option.selected = true;
+            }
+            selectElement.appendChild(option);
+        });
+    } catch (err) {
+        console.error('Error loading locations:', err);
+        showToast(appTranslations.errorLoading, 'danger');
+    }
+}
\ No newline at end of file
