diff --git a/pms/templates/okr/key_result/kr_card.html b/pms/templates/okr/key_result/kr_card.html
index 79ab2ae9f..1c45498a5 100644
--- a/pms/templates/okr/key_result/kr_card.html
+++ b/pms/templates/okr/key_result/kr_card.html
@@ -59,9 +59,9 @@
                 <li class="oh-dropdown__item">
                 <a onclick="event.stopPropagation();"
                   data-toggle="oh-modal-toggle"
-                  data-target="#objectDetailsModal"
+                  data-target="#objectUpdateModal"
                   hx-get="{% url 'update-key-result' kr.id %}"
-                  hx-target="#objectDetailsModalTarget"
+                  hx-target="#objectUpdateModalTarget"
                 >{% trans "Edit" %}</a>
                 </li>
                 <li class="oh-dropdown__item">
diff --git a/pms/templates/okr/key_result/kr_list.html b/pms/templates/okr/key_result/kr_list.html
index 51783cca2..8aa9acdf2 100644
--- a/pms/templates/okr/key_result/kr_list.html
+++ b/pms/templates/okr/key_result/kr_list.html
@@ -108,9 +108,9 @@
                     onclick="event.stopPropagation();"
                     class="oh-btn oh-btn--light-bkg w-100"
                     data-toggle="oh-modal-toggle"
-                    data-target="#objectDetailsModal"
+                    data-target="#objectUpdateModal"
                     hx-get="{% url 'update-key-result' kr.id %}"
-                    hx-target="#objectDetailsModalTarget"
+                    hx-target="#objectUpdateModalTarget"
                     title='{% trans "Edit" %}'
                     >
                     <ion-icon
diff --git a/pms/templates/okr/key_result/kr_nav.html b/pms/templates/okr/key_result/kr_nav.html
index 3e67c3704..f6e61a11a 100644
--- a/pms/templates/okr/key_result/kr_nav.html
+++ b/pms/templates/okr/key_result/kr_nav.html
@@ -109,9 +109,9 @@
             <a
               class="oh-btn oh-btn--secondary oh-btn--shadow"
               data-toggle="oh-modal-toggle"
-              data-target="#objectDetailsModal"
+              data-target="#objectCreateModal"
               hx-get="{% url 'create-key-result' %}"
-              hx-target="#objectDetailsModalTarget"
+              hx-target="#objectCreateModalTarget"
             >
               <ion-icon
                 class="md hydrated"
diff --git a/pms/templates/okr/key_result/real_kr_form.html b/pms/templates/okr/key_result/real_kr_form.html
index 8e236859d..49e8a5c89 100644
--- a/pms/templates/okr/key_result/real_kr_form.html
+++ b/pms/templates/okr/key_result/real_kr_form.html
@@ -13,7 +13,7 @@
     </h2>
   {% endif %}
 
-  <button type="button" class="oh-modal__close--custom" onclick="$('#objectDetailsModal').removeClass('oh-modal--show');">
+  <button type="button" class="oh-modal__close--custom" onclick="$(this).closest('.oh-modal--show').removeClass('oh-modal--show');">
     <ion-icon name="close-outline" role="img" aria-label="close outline"></ion-icon>
   </button>
 </div>
@@ -21,13 +21,13 @@
   {% if form.instance.id %}
     <form
       hx-post="{% url 'update-key-result' form.instance.id %}"
-      hx-target="#objectDetailsModalTarget"
+      hx-target="#objectUpdateModalTarget"
       id="realKeyResultForm"
     >
   {% else %}
     <form
       hx-post="{% url 'create-key-result' %}"
-      hx-target="#objectDetailsModalTarget"
+      hx-target="#objectCreateModalTarget"
       id="realKeyResultForm"
     >
   {% endif %}