diff --git a/py_app/app/static/css/warehouse.css b/py_app/app/static/css/warehouse.css
index 55cbb58..6ec10d3 100644
--- a/py_app/app/static/css/warehouse.css
+++ b/py_app/app/static/css/warehouse.css
@@ -1,3 +1,9 @@
+/* Make the warehouse locations table scrollable within the card */
+.warehouse-table-scroll {
+    max-height: 520px; /* fits inside 640px card with header and hint */
+    overflow-y: auto;
+    margin-bottom: 0;
+}
 
 /* Ensure .main-content is full width for warehouse pages */
 /* Fix horizontal overflow: use 100% width, not 100vw */
diff --git a/py_app/app/templates/create_locations.html b/py_app/app/templates/create_locations.html
index e59e426..6cf4ca0 100755
--- a/py_app/app/templates/create_locations.html
+++ b/py_app/app/templates/create_locations.html
@@ -38,29 +38,31 @@
         <div id="location-selection-hint" style="margin-bottom: 10px; font-size: 11px; color: #666; text-align: center;">
             Click on a row to select a location for printing
         </div>
-        <table class="scan-table" id="locations-table">
-            <thead>
-                <tr>
-                    <th>ID</th>
-                    <th>Location Code</th>
-                    <th>Size</th>
-                    <th>Description</th>
-                </tr>
-            </thead>
-            <tbody>
-                {% for loc in locations %}
-                <tr class="location-row" data-location-code="{{ loc[1] }}" 
-                    data-location-id="{{ loc[0] }}" 
-                    data-location-size="{{ loc[2] or '' }}" 
-                    data-location-description="{{ loc[3] or '' }}">
-                    <td>{{ loc[0] }}</td>
-                    <td>{{ loc[1] }}</td>
-                    <td>{{ loc[2] or '' }}</td>
-                    <td>{{ loc[3] or '' }}</td>
-                </tr>
-                {% endfor %}
-            </tbody>
-        </table>
+        <div class="warehouse-table-scroll">
+            <table class="scan-table" id="locations-table">
+                <thead>
+                    <tr>
+                        <th>ID</th>
+                        <th>Location Code</th>
+                        <th>Size</th>
+                        <th>Description</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    {% for loc in locations %}
+                    <tr class="location-row" data-location-code="{{ loc[1] }}" 
+                        data-location-id="{{ loc[0] }}" 
+                        data-location-size="{{ loc[2] or '' }}" 
+                        data-location-description="{{ loc[3] or '' }}">
+                        <td>{{ loc[0] }}</td>
+                        <td>{{ loc[1] }}</td>
+                        <td>{{ loc[2] or '' }}</td>
+                        <td>{{ loc[3] or '' }}</td>
+                    </tr>
+                    {% endfor %}
+                </tbody>
+            </table>
+        </div>
     </div>
 
     <!-- Container 3: Edit/Delete and Print (1 part width) -->