diff --git a/asset/templates/cbv/asset_batch_no/detail_actions.html b/asset/templates/cbv/asset_batch_no/detail_actions.html
index e1a964cc1..cc36a05e3 100644
--- a/asset/templates/cbv/asset_batch_no/detail_actions.html
+++ b/asset/templates/cbv/asset_batch_no/detail_actions.html
@@ -1,27 +1,42 @@
 {% load static i18n %}
-{% if perms.asset.change_assetlot %}
-    <!-- Start of Edit Button -->
-    <button data-toggle="oh-modal-toggle" data-target="#genericModal"
-        hx-get="{{ instance.get_update_url }}?instance_ids={{ instance.ordered_ids }}" hx-target="#genericModalBody"
-        class="oh-btn oh-btn--info w-100"
-    >
-        <ion-icon name="create-outline" role="img" class="md hydrated" aria-label="create outline"></ion-icon>
-        {% trans 'Edit' %}
-    </button>
-    <!-- End of Edit Button -->
-{% endif %}
+<div class="oh-btn-group w-100">
+	{% if perms.asset.change_assetlot %}
+        <!-- Start of Edit Button -->
+        <button
+            data-toggle="oh-modal-toggle"
+            data-target="#genericModal"
+            hx-get="{{ instance.get_update_url }}?instance_ids={{ instance.ordered_ids }}"
+            hx-target="#genericModalBody"
+            class="oh-btn oh-btn--info w-100"
+        >
+            <ion-icon
+                name="create-outline"
+                role="img"
+                class="md hydrated"
+                aria-label="create outline"
+            ></ion-icon>
+            {% trans 'Edit' %}
+        </button>
+        <!-- End of Edit Button -->
+    {% endif %}
 
-{% if perms.asset.delete_assetlot %}
-    <!-- Start of Delete Form -->
-    <form hx-confirm="{% trans 'Do you want to delete this batch number ?' %}" class="w-100"
-        hx-post="{{ instance.get_delete_url }}?instance_ids={{ instance.ordered_ids }}" hx-target="#AssetBatchList">
-        {% csrf_token %}
-        <button data-action="delete" type="submit"
+    {% if perms.asset.delete_assetlot %}
+        <!-- Start of Delete Form -->
+        <button
+            hx-confirm="{% trans 'Do you want to delete this batch number ?' %}"
+            hx-post="{{ instance.get_delete_url }}?instance_ids={{ instance.ordered_ids }}"
+            hx-target="#AssetBatchList"
+            hx-on:click="$(this).closest('.oh-modal--show').removeClass('oh-modal--show')"
             class="oh-btn oh-btn--danger w-100"
         >
-            <ion-icon name="trash-outline" role="img" class="md hydrated" aria-label="create outline"></ion-icon>
+            <ion-icon
+                name="trash-outline"
+                role="img"
+                class="md hydrated"
+                aria-label="create outline"
+            ></ion-icon>
             {% trans 'Delete' %}
         </button>
-    </form>
-    <!-- End of Delete Form -->
-{% endif %}
+        <!-- End of Delete Form -->
+	{% endif %}
+</div>