diff --git a/client_document_move_modal.php b/client_document_move_modal.php
new file mode 100644
index 00000000..98fbedad
--- /dev/null
+++ b/client_document_move_modal.php
@@ -0,0 +1,45 @@
+<div class="modal" id="moveDocumentModal<?php echo $document_id; ?>" tabindex="-1">
+    <div class="modal-dialog">
+        <div class="modal-content bg-dark">
+            <div class="modal-header">
+                <h5 class="modal-title"><i class="fa fa-fw fa-file-alt mr-2"></i>Moving document: <strong><?php echo $document_name; ?></strong></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="document_id" value="<?php echo $document_id; ?>">
+                <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
+                <div class="modal-body bg-white">
+
+                    <div class="form-group">
+                        <label>Move Document to</label>
+                        <div class="input-group">
+                            <div class="input-group-prepend">
+                                <span class="input-group-text"><i class="fa fa-fw fa-folder"></i></span>
+                            </div>
+                            <select class="form-control" name="folder">
+                                <option value="0">/</option>
+                                <?php
+                                $sql_folders_select = mysqli_query($mysqli, "SELECT * FROM folders WHERE folder_client_id = $client_id ORDER BY folder_name ASC");
+                                while ($row = mysqli_fetch_array($sql_folders_select)) {
+                                    $folder_id_select = intval($row['folder_id']);
+                                    $folder_name_select = nullable_htmlentities($row['folder_name']);
+                                    ?>
+                                    <option <?php if ($folder_id_select == $document_folder_id) echo "selected"; ?> value="<?php echo $folder_id_select ?>"><?php echo $folder_name_select; ?></option>
+                                    <?php
+                                }
+                                ?>
+                            </select>
+                        </div>
+                    </div>
+
+                </div>
+                <div class="modal-footer bg-white">
+                    <button type="submit" name="move_document" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Move</button>
+                    <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
+                </div>
+            </form>
+        </div>
+    </div>
+</div>
diff --git a/client_documents.php b/client_documents.php
index 1b752a66..6b9960ef 100644
--- a/client_documents.php
+++ b/client_documents.php
@@ -195,6 +195,10 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                                                 <a class="dropdown-item" href="#" data-toggle="modal" data-target="#shareModal" onclick="populateShareModal(<?php echo "$client_id, 'Document', $document_id"; ?>)">
                                                     <i class="fas fa-fw fa-share mr-2"></i>Share
                                                 </a>
+                                                <div class="dropdown-divider"></div>
+                                                <a class="dropdown-item" href="#" data-toggle="modal" data-target="#moveDocumentModal<?php echo $document_id; ?>">
+                                                    <i class="fas fa-fw fa-exchange-alt mr-2"></i>Move
+                                                </a>
                                                 <?php if ($session_user_role == 3) { ?>
                                                     <div class="dropdown-divider"></div>
                                                     <a class="dropdown-item text-danger text-bold" href="post.php?delete_document=<?php echo $document_id; ?>">
@@ -208,6 +212,8 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
                             <?php
 
+                            require("client_document_move_modal.php");
+
                             }
 
                             ?>
diff --git a/post/document.php b/post/document.php
index 73eaa14d..6156ace3 100644
--- a/post/document.php
+++ b/post/document.php
@@ -111,6 +111,27 @@ if (isset($_POST['edit_document'])) {
 
 }
 
+if (isset($_POST['move_document'])) {
+
+    validateTechRole();
+
+    $document_id = intval($_POST['document_id']);
+    $client_id = intval($_POST['client_id']);
+    $folder = intval($_POST['folder']);
+
+    // Document edit query
+    mysqli_query($mysqli,"UPDATE documents SET document_folder_id = $folder WHERE document_id = $document_id");
+
+    //Logging
+    mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Document', log_action = 'Modify', log_description = '$session_name moved document', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_client_id = $client_id, log_user_id = $session_user_id, log_entity_id = $document_id");
+
+
+    $_SESSION['alert_message'] = "Document moved";
+
+    header("Location: " . $_SERVER["HTTP_REFERER"]);
+
+}
+
 if (isset($_POST['edit_document_template'])) {
 
     validateTechRole();