diff --git a/inventory-app/inventory.py b/inventory-app/inventory.py
index 2d6f89d..db03ac7 100644
--- a/inventory-app/inventory.py
+++ b/inventory-app/inventory.py
@@ -145,6 +145,7 @@ class InventoryItemForm(CustomForm):
     shortener = FormField(ShortenerForm)
     _description_placeholder = "Insert Markdown here."
     description = TextAreaField('Description', [validators.optional(), validators.length(max=3000)], render_kw={"placeholder": _description_placeholder})
+    location = StringField('Location')
     def setup_defaults_add(self):
         setup_default_owner(self.inventory.form.owner.form.username)
         self.inventory.form.public.render_kw = {"checked": "checked"}
@@ -426,6 +427,7 @@ def view_inventory(slug=None):
     fields = [
         ("type", "Exclude type", list),
         ("tags", "Tags", list),
+        ("location", "Location", list),
     ]
     q = {"type": {"$ne": "token"}}
     template = "inventory.html"
diff --git a/inventory-app/templates/inventory.html b/inventory-app/templates/inventory.html
index e98e0b3..3d21ed2 100644
--- a/inventory-app/templates/inventory.html
+++ b/inventory-app/templates/inventory.html
@@ -19,6 +19,7 @@
         <th>Public</th>
         <th>Name</th>
         <th>Type</th>
+        <th>Location</th>
         <th>Owner</th>
         <th>User</th>
         {% if can_audit %}
@@ -40,6 +41,7 @@
           <td>{% if item.inventory.public %}<i class="material-icons">check_circle</i>{% else %}&nbsp;{% endif %}</td>
           <td><a href="/m/inventory/{{ item._id }}/view">{{ item | format_name }} {{ item.comment }}</a></td>
           <td>{{ item.type }}</td>
+          <td>{{ item.location }}</td>
           <td>{{ item | owner_link}}</td>
           <td>{{ item | user_link}}</td>
           {% if can_audit %}
diff --git a/inventory-app/templates/inventory_edit.html b/inventory-app/templates/inventory_edit.html
index e1e7e02..3b22aa0 100644
--- a/inventory-app/templates/inventory_edit.html
+++ b/inventory-app/templates/inventory_edit.html
@@ -92,6 +92,11 @@
         <td>{{ form.shortener.slug }}</td>
       </tr>
 
+      <tr>
+        <td>Location</td>
+        <td>{{ form.location }}</td>
+      </tr>
+
   </tbody>
 </table>
 
diff --git a/inventory-app/templates/inventory_view.html b/inventory-app/templates/inventory_view.html
index 31a86e1..64cbe36 100644
--- a/inventory-app/templates/inventory_view.html
+++ b/inventory-app/templates/inventory_view.html
@@ -119,6 +119,11 @@
 	 <td><a href="{{ item.external_link }}">External link</a></td>
       </tr>
 
+      <tr>
+        <td>Location</td>
+        <td>{{ item.location }}</td>
+      </tr>
+
       <tr>
         <td class="tooltip" data-tooltip="Unauthenticated user can see this in public list">Public</td>
         <td>{% if item.inventory.public %}<i class="material-icons">check_circle</i>{% endif %}</td>