diff --git a/utils/apparmor/sandbox.py b/utils/apparmor/sandbox.py
index dc2d19151..51048f6ff 100644
--- a/utils/apparmor/sandbox.py
+++ b/utils/apparmor/sandbox.py
@@ -706,6 +706,7 @@ def run_xsandbox(command, opt):
         x.start()
     except Exception as e:
         error(e)
+    os.chdir(old_cwd)
 
     if not opt.read_path:
         opt.read_path = []
@@ -721,6 +722,5 @@ def run_xsandbox(command, opt):
         x.cleanup()
         raise
     x.cleanup()
-    os.chdir(old_cwd)
 
     return rc, report