diff --git a/edit_ticket_modal.php b/edit_ticket_modal.php
index 633f5f21..b7c11dfb 100644
--- a/edit_ticket_modal.php
+++ b/edit_ticket_modal.php
@@ -94,6 +94,30 @@
             </div>
           </div>
 
+            <div class="form-group">
+                <label>Asset</label>
+                <div class="input-group">
+                    <div class="input-group-prepend">
+                        <span class="input-group-text"><i class="fa fa-fw fa-desktop"></i></span>
+                    </div>
+                    <select class="form-control select2" name="asset">
+                        <option value="0">- None -</option>
+                        <?php
+
+                        $sql_assets = mysqli_query($mysqli,"SELECT * FROM assets WHERE asset_client_id = $client_id ORDER BY asset_name ASC");
+                        while($row = mysqli_fetch_array($sql_assets)){
+                            $asset_id_select = $row['asset_id'];
+                            $asset_name_select = $row['asset_name'];
+                            ?>
+                            <option <?php if(!empty($ticket_asset_id) && $ticket_asset_id == $asset_id_select){ echo "selected"; } ?> value="<?php echo $asset_id_select; ?>"><?php echo $asset_name_select; ?></option>
+
+                            <?php
+                        }
+                        ?>
+                    </select>
+                </div>
+            </div>
+
           <div class="form-group">
             <textarea class="form-control summernote" rows="8" name="details" required><?php echo $ticket_details; ?></textarea>
           </div>
diff --git a/post.php b/post.php
index 0b2c0f5e..56501d18 100644
--- a/post.php
+++ b/post.php
@@ -4820,8 +4820,9 @@ if(isset($_POST['edit_ticket'])){
     $subject = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['subject'])));
     $priority = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['priority'])));
     $details = trim(mysqli_real_escape_string($mysqli,$_POST['details']));
+    $asset_id = intval($_POST['asset']);
 
-    mysqli_query($mysqli,"UPDATE tickets SET ticket_subject = '$subject', ticket_priority = '$priority', ticket_details = '$details', ticket_updated_at = NOW(), ticket_assigned_to = $assigned_to, ticket_contact_id = $contact_id WHERE ticket_id = $ticket_id AND company_id = $session_company_id");
+    mysqli_query($mysqli,"UPDATE tickets SET ticket_subject = '$subject', ticket_priority = '$priority', ticket_details = '$details', ticket_updated_at = NOW(), ticket_assigned_to = $assigned_to, ticket_contact_id = $contact_id, ticket_asset_id = $asset_id WHERE ticket_id = $ticket_id AND company_id = $session_company_id");
 
     //Logging
     mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Ticket', log_action = 'Modified', log_description = '$subject', log_created_at = NOW(), company_id = $session_company_id, log_user_id = $session_user_id");
diff --git a/ticket.php b/ticket.php
index 2a8cbc50..6d3cdd2c 100644
--- a/ticket.php
+++ b/ticket.php
@@ -35,8 +35,20 @@ if(isset($_GET['ticket_id'])){
   $ticket_updated_at = $row['ticket_updated_at'];
   $ticket_closed_at = $row['ticket_closed_at'];
   $ticket_created_by = $row['ticket_created_by'];
+  $ticket_asset_id = $row['ticket_asset_id'];
 
-  if($ticket_status == "Open"){
+  // Convert asset id to asset name
+  $ticket_asset_sql_result = mysqli_query($mysqli,"SELECT asset_name FROM assets WHERE asset_client_id = '$client_id' AND asset_id = '$ticket_asset_id' LIMIT 1");
+  if (mysqli_num_rows($ticket_asset_sql_result) > 0) {
+      // Set asset name
+      $ticket_asset_name = mysqli_fetch_array($ticket_asset_sql_result);
+      $ticket_asset_name = htmlentities($ticket_asset_name['asset_name']);
+  }
+  else {
+      $ticket_asset_name = '';
+  }
+
+      if($ticket_status == "Open"){
     $ticket_status_display = "<span class='p-2 badge badge-primary'>$ticket_status</span>";
   }elseif($ticket_status == "Working"){
     $ticket_status_display = "<span class='p-2 badge badge-success'>$ticket_status</span>";
@@ -303,6 +315,7 @@ if(isset($_GET['ticket_id'])){
       <div class="ml-1"><i class="fa fa-fw fa-thermometer-half text-secondary mr-2 mb-2"></i> <?php echo $ticket_priority_display; ?></div>
       <div class="ml-1"><i class="fa fa-fw fa-user text-secondary mr-2 mb-2"></i> <?php echo $ticket_assigned_to_display; ?></div>
       <div class="ml-1"><i class="fa fa-fw fa-clock text-secondary mr-2 mb-2"></i> <?php echo $ticket_created_at; ?></div>
+        <div class="ml-1"><i class="fa fa-fw fa-desktop text-secondary mr-2 mb-2"></i> <?php echo $ticket_asset_name; ?></div>
     </div>
 
   </div>