diff --git a/core/templates/core/inventory.html b/core/templates/core/inventory.html
index 3689b85..15462a6 100644
--- a/core/templates/core/inventory.html
+++ b/core/templates/core/inventory.html
@@ -534,7 +534,7 @@
                                     <option value="{{ category.id }}">{% if LANGUAGE_CODE == 'ar' %}{{ category.name_ar }}{% else %}{{ category.name_en }}{% endif %}</option>
                                     {% endfor %}
                                 </select>
-                                <button class="btn btn-outline-primary" type="button" data-bs-toggle="modal" data-bs-target="#quickAddCategoryModal">
+                                <button class="btn btn-outline-primary" type="button" onclick="bootstrap.Modal.getOrCreateInstance('#quickAddCategoryModal').show()">
                                     <i class="bi bi-plus-lg"></i>
                                 </button>
                             </div>
@@ -548,7 +548,7 @@
                                     <option value="{{ unit.id }}">{% if LANGUAGE_CODE == 'ar' %}{{ unit.name_ar }}{% else %}{{ unit.name_en }}{% endif %}</option>
                                     {% endfor %}
                                 </select>
-                                <button class="btn btn-outline-primary" type="button" data-bs-toggle="modal" data-bs-target="#quickAddUnitModal">
+                                <button class="btn btn-outline-primary" type="button" onclick="bootstrap.Modal.getOrCreateInstance('#quickAddUnitModal').show()">
                                     <i class="bi bi-plus-lg"></i>
                                 </button>
                             </div>
@@ -562,7 +562,7 @@
                                     <option value="{{ supplier.id }}">{{ supplier.name }}</option>
                                     {% endfor %}
                                 </select>
-                                <button class="btn btn-outline-primary" type="button" data-bs-toggle="modal" data-bs-target="#quickAddSupplierModal">
+                                <button class="btn btn-outline-primary" type="button" onclick="bootstrap.Modal.getOrCreateInstance('#quickAddSupplierModal').show()">
                                     <i class="bi bi-plus-lg"></i>
                                 </button>
                             </div>
@@ -813,6 +813,13 @@
 
 <script>
     document.addEventListener('DOMContentLoaded', function() {
+        // Fix for multiple modals: Ensure body class is preserved
+        document.addEventListener('hidden.bs.modal', function () {
+            if (document.querySelectorAll('.modal.show').length > 0) {
+                document.body.classList.add('modal-open');
+            }
+        });
+
         // Suggest SKU
         const suggestBtn = document.getElementById('suggestSkuBtn');
         if (suggestBtn) {