diff --git a/op/op.Ajax.php b/op/op.Ajax.php
index 6717f4b4b..7d4cfcac3 100644
--- a/op/op.Ajax.php
+++ b/op/op.Ajax.php
@@ -256,6 +256,34 @@ switch($command) {
 		}
 		break; /* }}} */
 
+	case 'deletefolder': /* {{{ */
+		if($user) {
+			if(!checkFormKey('removefolder', 'GET')) {
+				header('Content-Type', 'application/json');
+				echo json_encode(array('success'=>false, 'message'=>getMLText('invalid_request_token'), 'data'=>''));
+			} else {
+				$folder = $dms->getFolder($_REQUEST['id']);
+				if($folder) {
+					if ($folder->getAccessMode($user) >= M_READWRITE) {
+						if($folder->remove()) {
+							header('Content-Type', 'application/json');
+							echo json_encode(array('success'=>true, 'message'=>'', 'data'=>''.$_REQUEST['formtoken']));
+						} else {
+							header('Content-Type', 'application/json');
+							echo json_encode(array('success'=>false, 'message'=>'Error removing folder', 'data'=>''));
+						}
+					} else {
+						header('Content-Type', 'application/json');
+						echo json_encode(array('success'=>false, 'message'=>'No access', 'data'=>''));
+					}
+				} else {
+					header('Content-Type', 'application/json');
+					echo json_encode(array('success'=>false, 'message'=>'No folder', 'data'=>''));
+				}
+			}
+		}
+		break; /* }}} */
+
 	case 'deletedocument': /* {{{ */
 		if($user) {
 			if(!checkFormKey('removedocument', 'GET')) {