diff --git a/ereuse_devicehub/static/js/main_inventory.js b/ereuse_devicehub/static/js/main_inventory.js
index 32bf1705..83ed993d 100644
--- a/ereuse_devicehub/static/js/main_inventory.js
+++ b/ereuse_devicehub/static/js/main_inventory.js
@@ -51,6 +51,7 @@ function deviceSelect() {
         $("#datawipeModal .btn-primary").show();
 
         $("#addingTagModal .pol").hide();
+        $("#addingTagModal .btn-primary").show();
     }
 }
 
@@ -64,6 +65,11 @@ function removeTag() {
     }
 }
 
+function addTag() {
+    deviceSelect();
+    $("#addingTagModal").click();
+}
+
 function newTrade(action) {
     var title = "Trade "
     var user_to = $("#user_to").data("email");
diff --git a/ereuse_devicehub/templates/inventory/addDevicestag.html b/ereuse_devicehub/templates/inventory/addDevicestag.html
index 9c157729..cb929d37 100644
--- a/ereuse_devicehub/templates/inventory/addDevicestag.html
+++ b/ereuse_devicehub/templates/inventory/addDevicestag.html
@@ -24,7 +24,7 @@
 
         <div class="modal-footer">
           <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>
-          <input type="submit" class="btn btn-primary d-none" value="Save changes" />
+          <input type="submit" class="btn btn-primary" style="display: none;" value="Save changes" />
         </div>
       </form>
 
diff --git a/ereuse_devicehub/templates/inventory/device_list.html b/ereuse_devicehub/templates/inventory/device_list.html
index 205252aa..e917a843 100644
--- a/ereuse_devicehub/templates/inventory/device_list.html
+++ b/ereuse_devicehub/templates/inventory/device_list.html
@@ -198,7 +198,7 @@
               </button>
               <ul class="dropdown-menu" aria-labelledby="btnTags">
                 <li>
-                  <a href="javascript:void()" class="dropdown-item" data-bs-toggle="modal" data-bs-target="#addingTagModal">
+                  <a href="javascript:addTag()" class="dropdown-item" data-bs-toggle="modal" data-bs-target="#addingTagModal">
                     <i class="bi bi-plus"></i>
                     Add Tag to selected Devices
                   </a>