diff --git a/device/templates/details.html b/device/templates/details.html
index c889d45..82c52ee 100644
--- a/device/templates/details.html
+++ b/device/templates/details.html
@@ -132,9 +132,9 @@
               <td>{{ a.created }}</td>
               <td>
                 <div class="btn-group float-end">
-                  <a href="{% url 'device:update_user_property' a.id %}" class="btn btn-sm btn-secondary">
-                    <i class="bi bi-pencil"></i>
-                  </a>
+                  <button type="button" class="btn btn-sm btn-primary" data-bs-toggle="modal" data-bs-target="#editModal{{ a.id }}">
+                    <i class="bi bi-pencil"></i> {% trans 'Edit' %}
+                  </button>
                   <button type="button" class="btn btn-sm btn-danger" data-bs-toggle="modal" data-bs-target="#deleteModal{{ a.id }}">
                 <i class="bi bi-trash"></i>
                   </button>
@@ -172,6 +172,33 @@
 </div>
 {% endfor %}
 
+<!-- popup modals for edit button -->
+{% for a in object.get_user_properties %}
+<div class="modal fade" id="editModal{{ a.id }}" tabindex="-1" aria-labelledby="editModalLabel{{ a.id }}" aria-hidden="true">
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h5 class="modal-title" id="editModalLabel{{ a.id }}">{% trans "Edit User Property" %}</h5>
+        <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+      </div>
+      <div class="modal-body">
+        <form id="editForm{{ a.id }}" method="post" action="{% url 'device:update_user_property' a.id %}">
+          {% csrf_token %}
+          <div class="mb-3">
+            <label for="key" class="form-label">{% trans "Key" %}</label>
+            <input type="text" class="form-control" id="key" name="key" value="{{ a.key }}">
+          </div>
+          <div class="mb-3">
+            <label for="value" class="form-label">{% trans "Value" %}</label>
+            <input type="text" class="form-control" id="value" name="value" value="{{ a.value }}">
+          </div>
+          <button type="submit" class="btn btn-primary">{% trans "Save changes" %}</button>
+        </form>
+      </div>
+    </div>
+  </div>
+</div>
+{% endfor %}
 
     <div class="tab-pane fade" id="documents">
       <div class="btn-group mt-1 mb-3">
diff --git a/device/views.py b/device/views.py
index b97c062..b00e6fa 100644
--- a/device/views.py
+++ b/device/views.py
@@ -208,8 +208,24 @@ class UpdateUserPropertyView(DashboardView, UpdateView):
     model = UserProperty
     fields = ("key", "value")
 
+    def get_form_kwargs(self):
+        pk = self.kwargs.get('pk')
+        user_property = get_object_or_404(UserProperty, pk=pk, owner=self.request.user.institution)
+        self.property = SystemProperty.objects.filter(
+            owner=self.request.user.institution,
+            uuid=user_property.uuid,
+            type=Property.Type.SYSTEM
+        ).first()
+
+        if not self.property:
+            raise Http404
+
+        kwargs = super().get_form_kwargs()
+        kwargs['instance'] = user_property
+        return kwargs
+
     def form_valid(self, form):
-        form.instance.owner = self.request.user.institution
+        form.instance.owner = self.request  .user.institution
         form.instance.user = self.request.user
         form.instance.type = Property.Type.USER
         response = super().form_valid(form)
@@ -223,22 +239,7 @@ class UpdateUserPropertyView(DashboardView, UpdateView):
             return referer
         else:
             return reverse_lazy('device:details', args=[self.object.device.pk])
-        
-    def get_form_kwargs(self):
-        pk = self.kwargs.get('pk')
-        user_property = get_object_or_404(UserProperty, pk=pk, owner=self.request.user.institution)
-        self.annotation = SystemProperty.objects.filter(
-            owner=self.request.user.institution,
-            uuid=user_property.uuid,
-            type=Property.Type.SYSTEM
-        ).first()
 
-        if not self.annotation:
-            raise Http404
-
-        kwargs = super().get_form_kwargs()
-        kwargs['instance'] = user_property
-        return kwargs
 
 class DeleteUserPropertyView(DashboardView, DeleteView):
     model = UserProperty