diff --git a/autospec/specfiles.py b/autospec/specfiles.py
index e0cefdb8..3274ea30 100644
--- a/autospec/specfiles.py
+++ b/autospec/specfiles.py
@@ -1434,6 +1434,9 @@ def write_pyproject_pattern(self):
         for module in self.config.pypi_overrides:
             self._write_strip(f"pypi-dep-fix.py . {module}")
         self._write_strip("python3 -m build --wheel --skip-dependency-check --no-isolation " + self.config.extra_configure)
+        self._write_strip("\n")
+        if self.config.subdir:
+            self._write_strip("popd")
 
         if self.config.config_opts['use_avx2']:
             self._write_strip("pushd ../buildavx2/" + self.config.subdir)
@@ -1464,8 +1467,6 @@ def write_pyproject_pattern(self):
             self._write_strip("popd")
 
         self._write_strip("\n")
-        if self.config.subdir:
-            self._write_strip("popd")
         self.write_build_append()
         self.write_check()
         self._write_strip("%install")