diff --git a/Installer/copy_build.cmd b/Installer/copy_build.cmd
index cbe12129..15ac188d 100644
--- a/Installer/copy_build.cmd
+++ b/Installer/copy_build.cmd
@@ -38,8 +38,8 @@ copy "%redistPath%\*" %instPath%\
 
 ECHO Copying Qt libraries
 
-REM IF NOT %archPath% == ARM64 (
-IF %archPath% == Win32 (
+IF NOT %archPath% == ARM64 (
+REM IF %archPath% == Win32 (
 	copy %qtPath%\bin\Qt5Core.dll %instPath%\
 	copy %qtPath%\bin\Qt5Gui.dll %instPath%\
 	copy %qtPath%\bin\Qt5Network.dll %instPath%\
diff --git a/SandboxiePlus/SandMan/Views/SbieView.cpp b/SandboxiePlus/SandMan/Views/SbieView.cpp
index 4ae9c243..f92d652a 100644
--- a/SandboxiePlus/SandMan/Views/SbieView.cpp
+++ b/SandboxiePlus/SandMan/Views/SbieView.cpp
@@ -1234,7 +1234,7 @@ void CSbieView::OnSandBoxAction(QAction* Action, const QList<CSandBoxPtr>& SandB
 		if (!TestNameAndWarn(Value))
 			return;
 
-		SB_STATUS Status = SandBoxes.first()->RenameBox(Value);
+		SB_STATUS Status = SandBoxes.first()->RenameBox(Value.replace(" ", "_"));
 		if (!Status.IsError())
 			RenameItem(OldValue.replace(" ", "_"), Value.replace(" ", "_"));
 		Results.append(Status);