diff --git a/common/flatpak-run.c b/common/flatpak-run.c
index 52fd9854..ef498e90 100644
--- a/common/flatpak-run.c
+++ b/common/flatpak-run.c
@@ -4220,15 +4220,6 @@ flatpak_run_app (FlatpakDecomposed *app_ref,
 
   flags |= flatpak_context_get_run_flags (app_context);
 
-  if (!sandboxed)
-    {
-      if (!flatpak_instance_ensure_per_app_dir (app_id,
-                                                &per_app_dir_lock_fd,
-                                                &per_app_dir_lock_path,
-                                                error))
-        return FALSE;
-    }
-
   if (!flatpak_run_setup_base_argv (bwrap, runtime_files, app_id_dir, app_arch, flags, error))
     return FALSE;
 
@@ -4256,6 +4247,15 @@ flatpak_run_app (FlatpakDecomposed *app_ref,
                                       error))
     return FALSE;
 
+  if (!sandboxed)
+    {
+      if (!flatpak_instance_ensure_per_app_dir (app_id,
+                                                &per_app_dir_lock_fd,
+                                                &per_app_dir_lock_path,
+                                                error))
+        return FALSE;
+    }
+
   if (!flatpak_run_add_dconf_args (bwrap, app_id, metakey, error))
     return FALSE;