diff --git a/src/libcalamares/utils/CalamaresUtilsSystem.cpp b/src/libcalamares/utils/CalamaresUtilsSystem.cpp
index 235023406..11888a3cd 100644
--- a/src/libcalamares/utils/CalamaresUtilsSystem.cpp
+++ b/src/libcalamares/utils/CalamaresUtilsSystem.cpp
@@ -143,13 +143,14 @@ System::targetEnvOutput( const QStringList& args,
 
         program = "chroot";
         arguments = QStringList( { destDir } );
+        arguments << args;
     }
     else
     {
         program = "sh";
         arguments = QStringList( { "-c" } );
+        arguments << QString( "\"%1\"" ).arg( args.join( ' ' ) );
     }
-    arguments << args;
 
     process.setProgram( program );
     process.setArguments( arguments );