diff --git a/agent/modals/ticket/ticket_edit_project.php b/agent/modals/ticket/ticket_edit_project.php
new file mode 100644
index 00000000..b75232a1
--- /dev/null
+++ b/agent/modals/ticket/ticket_edit_project.php
@@ -0,0 +1,65 @@
+<?php
+
+require_once '../../../includes/modal_header.php';
+
+$ticket_id = intval($_GET['id']);
+
+$sql = mysqli_query($mysqli, "SELECT * FROM tickets LEFT JOIN clients ON client_id = ticket_client_id WHERE ticket_id = $ticket_id LIMIT 1");
+
+$row = mysqli_fetch_array($sql);
+$client_id = intval($row['ticket_client_id']);
+$client_name = nullable_htmlentities($row['client_name']);
+$ticket_prefix = nullable_htmlentities($row['ticket_prefix']);
+$ticket_number = intval($row['ticket_number']);
+$ticket_project_id = intval($row['ticket_project_id']);
+
+
+// Select box arrays
+$sql_projects = mysqli_query($mysqli, "SELECT project_id, project_name FROM projects WHERE (project_client_id = $client_id OR project_client_id = 0) AND project_completed_at IS NULL AND project_archived_at IS NULL ORDER BY project_name ASC");
+
+// Generate the HTML form content using output buffering.
+ob_start();
+?>
+
+<div class="modal-header bg-dark">
+    <h5 class="modal-title"><i class="fas fa-fw fa-project-diagram mr-2"></i>Project: <strong><?= "$ticket_prefix$ticket_number" ?></strong> - <?= $client_name ?></h5>
+    <button type="button" class="close text-white" data-dismiss="modal">
+        <span>&times;</span>
+    </button>
+</div>
+<form action="post.php" method="post" autocomplete="off">
+    <input type="hidden" name="ticket_id" value="<?php echo $ticket_id; ?>">
+    <div class="modal-body">
+
+        <div class="form-group">
+            <label>Project</label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-project-diagram"></i></span>
+                </div>
+                <select class="form-control select2" name="project">
+                    <option value="0">- None -</option>
+                    <?php
+                    while ($row = mysqli_fetch_array($sql_projects)) {
+                        $project_id = intval($row['project_id']);
+                        $project_name = nullable_htmlentities($row['project_name']); ?>
+                        <option <?php if ($ticket_project_id == $project_id) { echo "selected"; } ?> 
+                            value="<?= $project_id ?>"><?= $project_name ?>
+                        </option>
+
+                    <?php } ?>
+                </select>
+            </div>
+        </div>
+
+    </div>
+
+    <div class="modal-footer">
+        <button type="submit" name="edit_ticket_project" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Save</button>
+        <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
+    </div>
+
+</form>
+
+<?php
+require_once '../../../includes/modal_footer.php';
diff --git a/agent/post/ticket.php b/agent/post/ticket.php
index bbe55b50..4694ac70 100644
--- a/agent/post/ticket.php
+++ b/agent/post/ticket.php
@@ -416,6 +416,28 @@ if (isset($_POST['edit_ticket_contact'])) {
 
 }
 
+if (isset($_POST['edit_ticket_project'])) {
+
+    enforceUserPermission('module_support', 2);
+
+    $ticket_id = intval($_POST['ticket_id']);
+    $project_id = intval($_POST['project']);
+
+    $project_name = sanitizeInput(getFieldById('projects', $project_id, 'project_name'));
+    $client_id = intval(getFieldById('tickets', $ticket_id, 'ticket_client_id'));
+    $ticket_prefix = sanitizeInput(getFieldById('tickets', $ticket_id, 'ticket_prefix'));
+    $ticket_number = sanitizeInput(getFieldById('tickets', $ticket_id, 'ticket_number'));
+
+    mysqli_query($mysqli, "UPDATE tickets SET ticket_project_id = $project_id WHERE ticket_id = $ticket_id");
+
+    logAction("Ticket", "Edit", "$session_name set ticket $ticket_prefix$ticket_number project to $project_name", $client_id, $ticket_id);
+
+    flash_alert("Project changed to <strong>$project_name</strong> for Ticket <strong>$ticket_prefix$ticket_number</strong>");
+
+    redirect();
+
+}
+
 if (isset($_POST['add_ticket_watcher'])) {
 
     enforceUserPermission('module_support', 2);
diff --git a/agent/ticket.php b/agent/ticket.php
index 383bfeb1..f3f50b7e 100644
--- a/agent/ticket.php
+++ b/agent/ticket.php
@@ -1227,9 +1227,9 @@ if (isset($_GET['ticket_id'])) {
                             <h5 class="card-title"><i class="fas fa-fw fa-project-diagram mr-2 mt-2"></i>Project</h5>
                             <div class="card-tools">
                                 <?php if (empty($ticket_resolved_at) && lookupUserPermission("module_support") >= 2) { ?>
-                                    <a class="btn btn-light text-secondary btn-sm" href="#">
+                                    <button type="button" class="btn btn-light text-secondary btn-sm ajax-modal" data-modal-url="modals/ticket/ticket_edit_project.php?id=<?= $ticket_id ?>">
                                         <i class="fas fa-edit"></i>
-                                    </a>
+                                    </button>
                                 <?php } ?>
                             </div>
                         </div>