diff --git a/CHANGELOG.md b/CHANGELOG.md
index ac49778b..346d7f8a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - fixed command line corruption with breakout processes [#2377](https://github.com/sandboxie-plus/Sandboxie/issues/2377)
 - fixed issues with Privacy Enchanced box types [#2342](https://github.com/sandboxie-plus/Sandboxie/issues/2342)
 - fixed issuee with boxed object directroy initialization [#2342](https://github.com/sandboxie-plus/Sandboxie/issues/2342)
+- sandboxie no longer leaves behing permanent directory objects
 
 
 ## [1.5.0 / 5.60.0] - 2022-10-19
diff --git a/Sandboxie/core/drv/ipc.c b/Sandboxie/core/drv/ipc.c
index 1ef84bf8..7d725604 100644
--- a/Sandboxie/core/drv/ipc.c
+++ b/Sandboxie/core/drv/ipc.c
@@ -104,6 +104,20 @@ static const WCHAR *Ipc_Section_TypeName    = L"Section";
 static const WCHAR *Ipc_JobObject_TypeName  = L"JobObject";
 static const WCHAR *Ipc_SymLink_TypeName    = L"SymbolicLinkObject";
 
+static PERESOURCE Ipc_DirLock = NULL;
+
+static LIST Ipc_ObjDirs;
+
+//---------------------------------------------------------------------------
+// Structures and Types
+//---------------------------------------------------------------------------
+
+typedef struct _DIR_OBJ_HANDLE {
+
+    LIST_ELEM list_elem;
+    HANDLE handle;
+
+} DIR_OBJ_HANDLE;
 
 //---------------------------------------------------------------------------
 // Ipc_Init
@@ -118,6 +132,10 @@ _FX BOOLEAN Ipc_Init(void)
     };
     const UCHAR **NamePtr;
 
+    if (! Mem_GetLockResource(&Ipc_DirLock, TRUE))
+        return FALSE;
+    List_Init(&Ipc_ObjDirs);
+
     //
     // set object open handlers for generic objects
     //
@@ -304,7 +322,7 @@ _FX BOOLEAN Ipc_CreateBoxPath(PROCESS *proc)
     RtlSetDaclSecurityDescriptor(&sd, TRUE, NULL, FALSE);
     InitializeObjectAttributes(
         &objattrs, &objname,
-        OBJ_CASE_INSENSITIVE | OBJ_PERMANENT | OBJ_KERNEL_HANDLE,
+        OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, // | OBJ_PERMANENT,
         NULL, &sd);
 
     //
@@ -345,8 +363,21 @@ _FX BOOLEAN Ipc_CreateBoxPath(PROCESS *proc)
             // using the full path.  otherwise, we're done
             //
 
-            if (NT_SUCCESS(status))
-                ZwClose(handle);
+            if (NT_SUCCESS(status)) {
+
+                //ZwClose(handle);
+
+                KIRQL irql;
+                KeRaiseIrql(APC_LEVEL, &irql);
+                ExAcquireResourceExclusiveLite(Ipc_DirLock, TRUE);
+
+                DIR_OBJ_HANDLE *obj_handle = Mem_Alloc(Driver_Pool, sizeof(DIR_OBJ_HANDLE));
+                obj_handle->handle = handle;
+                List_Insert_After(&Ipc_ObjDirs, NULL, obj_handle);
+
+                ExReleaseResourceLite(Ipc_DirLock);
+                KeLowerIrql(irql);
+            }
 
             if (status == STATUS_OBJECT_NAME_COLLISION)
                 status = STATUS_SUCCESS;
@@ -1495,6 +1526,7 @@ _FX NTSTATUS Ipc_Api_CreateDirOrLink(PROCESS *proc, ULONG64 *parms)
         return STATUS_NOT_IMPLEMENTED;
 
     status = STATUS_SUCCESS;
+    handle = NULL;
 
     //
     // copy first user parameter: objname
@@ -1566,7 +1598,7 @@ _FX NTSTATUS Ipc_Api_CreateDirOrLink(PROCESS *proc, ULONG64 *parms)
 
     InitializeObjectAttributes(
         &objattrs, &objname,
-        OBJ_CASE_INSENSITIVE | OBJ_PERMANENT | OBJ_KERNEL_HANDLE,
+        OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, // | OBJ_PERMANENT, 
         NULL, Driver_PublicSd);
 
     RtlInitUnicodeString(&objname, objname_buf);
@@ -1582,33 +1614,12 @@ _FX NTSTATUS Ipc_Api_CreateDirOrLink(PROCESS *proc, ULONG64 *parms)
 
             status = ZwCreateSymbolicLinkObject(
                 &handle, SYMBOLIC_LINK_ALL_ACCESS, &objattrs, &target);
-
-            if (NT_SUCCESS(status))
-                ZwClose(handle);
         }
 
         Mem_Free(target_buf, target_len + sizeof(WCHAR));
 
     } else {
 
-        if (Driver_LowLabelSd) {
-
-            //
-            // prior to version 3.68, we did not create object directories
-            // with a low integrity label.  so to make sure migration is
-            // smooth from earlier versions, we use the OBJ_OPENIF flag to
-            // force the directory to always open successfully, so that we
-            // can call ZwSetSecurityObject
-            //
-            // in later releases, when it is unlikely to still encounter
-            // object directories created without the integrity label, it
-            // would be ok to remove the OBJ_OPENIF flag, and only apply
-            // the label when actually creating the object directory
-            //
-
-            objattrs.Attributes |= OBJ_OPENIF;
-        }
-
         status = ZwCreateDirectoryObject(
             &handle, DIRECTORY_ALL_ACCESS, &objattrs);
 
@@ -1619,11 +1630,25 @@ _FX NTSTATUS Ipc_Api_CreateDirOrLink(PROCESS *proc, ULONG64 *parms)
                 ZwSetSecurityObject(
                     handle, LABEL_SECURITY_INFORMATION, Driver_LowLabelSd);
             }
-
-            ZwClose(handle);
         }
     }
 
+    if (handle != NULL) {
+
+        //ZwClose(handle);
+
+        KIRQL irql;
+        KeRaiseIrql(APC_LEVEL, &irql);
+        ExAcquireResourceExclusiveLite(Ipc_DirLock, TRUE);
+
+        DIR_OBJ_HANDLE *obj_handle = Mem_Alloc(Driver_Pool, sizeof(DIR_OBJ_HANDLE));
+        obj_handle->handle = handle;
+        List_Insert_After(&Ipc_ObjDirs, NULL, obj_handle);
+
+        ExReleaseResourceLite(Ipc_DirLock);
+        KeLowerIrql(irql);
+    }
+
     Mem_Free(objname_buf, objname_len + sizeof(WCHAR));
 
     if (status == STATUS_OBJECT_NAME_COLLISION)
@@ -1796,4 +1821,20 @@ _FX void Ipc_Unload(void)
 {
     if (Ipc_Dynamic_Ports.pPortLock)
         Mem_FreeLockResource(&Ipc_Dynamic_Ports.pPortLock);
+
+    KIRQL irql;
+    KeRaiseIrql(APC_LEVEL, &irql);
+    ExAcquireResourceExclusiveLite(Ipc_DirLock, TRUE);
+
+    DIR_OBJ_HANDLE* obj_handle = List_Head(&Ipc_ObjDirs);
+    while (obj_handle) {
+
+        ZwClose(obj_handle->handle);
+        obj_handle = List_Next(obj_handle);
+    }
+
+    ExReleaseResourceLite(Ipc_DirLock);
+    KeLowerIrql(irql);
+
+    Mem_FreeLockResource(&Ipc_DirLock);
 }