diff --git a/public/viewjs/equipment.js b/public/viewjs/equipment.js
index fc3be5f9..1f2a21d5 100644
--- a/public/viewjs/equipment.js
+++ b/public/viewjs/equipment.js
@@ -38,6 +38,7 @@ function DisplayEquipment(id)
 		{
 			$(".selected-equipment-name").text(equipmentItem.name);
 			$("#description-tab-content").html(equipmentItem.description);
+			$(".equipment-edit-button").attr("href", U("/equipment/" + equipmentItem.id.toString()));
 
 			if (equipmentItem.instruction_manual_file_name !== null && !equipmentItem.instruction_manual_file_name.isEmpty())
 			{
diff --git a/views/equipment.blade.php b/views/equipment.blade.php
index 04d3a77a..e1284e85 100644
--- a/views/equipment.blade.php
+++ b/views/equipment.blade.php
@@ -50,7 +50,7 @@
 				<div id="selectedEquipmentInstructionManualCard" class="card">
 					<div class="card-header">
 						<i class="fas fa-toolbox"></i> <span class="selected-equipment-name"></span>&nbsp;&nbsp;
-						<a class="btn btn-info btn-sm btn-outline-info py-0" href="{{ $U('/equipment/') }}{{ $equipmentItem->id }}">
+						<a class="btn btn-info btn-sm btn-outline-info py-0 equipment-edit-button" href="#">
 							<i class="fas fa-edit"></i>
 						</a>
 						<a class="btn btn-danger btn-sm btn-outline-danger py-0 equipment-delete-button" href="#" data-equipment-id="{{ $equipmentItem->id }}" data-equipment-name="{{ $equipmentItem->name }}">
@@ -70,7 +70,7 @@
 				<div id="selectedEquipmentDescriptionCard" class="card">
 					<div class="card-header">
 						<i class="fas fa-toolbox"></i> <span class="selected-equipment-name"></span>&nbsp;&nbsp;
-						<a class="btn btn-info btn-sm btn-outline-info py-0" href="{{ $U('/equipment/') }}{{ $equipmentItem->id }}">
+						<a class="btn btn-info btn-sm btn-outline-info py-0 equipment-edit-button" href="#">
 							<i class="fas fa-edit"></i>
 						</a>
 						<a class="btn btn-danger btn-sm btn-outline-danger py-0 equipment-delete-button" href="#" data-equipment-id="{{ $equipmentItem->id }}" data-equipment-name="{{ $equipmentItem->name }}">