diff --git a/agent/modals/document/document_edit.php b/agent/modals/document/document_edit.php
index c7e33e24..0d59adbe 100644
--- a/agent/modals/document/document_edit.php
+++ b/agent/modals/document/document_edit.php
@@ -37,27 +37,6 @@ ob_start();
             <textarea class="form-control tinymce" name="content"><?php echo $document_content; ?></textarea>
         </div>
 
-        <div class="form-group">
-            <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 select2" 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_assoc($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 class="form-group">
             <input type="text" class="form-control" name="description" value="<?php echo $document_description; ?>" placeholder="Short summary of changes">
         </div>
diff --git a/agent/modals/document/document_move.php b/agent/modals/document/document_move.php
index c72f776e..f68429b0 100644
--- a/agent/modals/document/document_move.php
+++ b/agent/modals/document/document_move.php
@@ -35,7 +35,7 @@ ob_start();
                     <option value="0">/</option>
                     <?php
                     // Fetch all folders for the client
-                    $sql_all_folders = mysqli_query($mysqli, "SELECT folder_id, folder_name, parent_folder FROM folders WHERE folder_location = 0 AND folder_client_id = $client_id ORDER BY folder_name ASC");
+                    $sql_all_folders = mysqli_query($mysqli, "SELECT folder_id, folder_name, parent_folder FROM folders WHERE folder_client_id = $client_id ORDER BY folder_name ASC");
                     $folders = array();
 
                     // Build an associative array of folders indexed by folder_id
diff --git a/agent/modals/file/file_move.php b/agent/modals/file/file_move.php
index 684ff884..925fe4ce 100644
--- a/agent/modals/file/file_move.php
+++ b/agent/modals/file/file_move.php
@@ -58,7 +58,7 @@ ob_start();
                     <option value="0">/</option>
                     <?php
                     // Fetch all folders for the client
-                    $sql_all_folders = mysqli_query($mysqli, "SELECT folder_id, folder_name, parent_folder FROM folders WHERE folder_location = 1 AND folder_client_id = $client_id ORDER BY folder_name ASC");
+                    $sql_all_folders = mysqli_query($mysqli, "SELECT folder_id, folder_name, parent_folder FROM folders WHERE folder_client_id = $client_id ORDER BY folder_name ASC");
                     $folders = array();
 
                     // Build an associative array of folders indexed by folder_id
diff --git a/agent/post/document.php b/agent/post/document.php
index 2e230be3..8617570d 100644
--- a/agent/post/document.php
+++ b/agent/post/document.php
@@ -210,7 +210,6 @@ if (isset($_POST['edit_document'])) {
             document_description = '$description',
             document_content     = '$content',
             document_content_raw = '$content_raw',
-            document_folder_id   = $folder,
             document_updated_by  = $session_user_id
          WHERE document_id = $document_id"
     );