diff --git a/AcManager.Tools/Helpers/AcSettings/ControlsSettings.cs b/AcManager.Tools/Helpers/AcSettings/ControlsSettings.cs
index eab1f98b8..0914cbe73 100644
--- a/AcManager.Tools/Helpers/AcSettings/ControlsSettings.cs
+++ b/AcManager.Tools/Helpers/AcSettings/ControlsSettings.cs
@@ -1189,7 +1189,8 @@ private void EntryPropertyChanged(object sender, PropertyChangedEventArgs e) {
                         try {
                             _skip = true;
                             foreach (var entry in Entries.OfType<IDirectInputEntry>().Where(x => x.Id == HandbrakeId
-                                    && x.Device?.Same(senderEntry.Device) != true)) {
+                                    && x.Device?.Same(senderEntry.Device) != true
+                                    && !(x is ControllerButtonEntry))) {
                                 entry.Clear();
                             }
                         } finally {
diff --git a/AcManager/AcManager.csproj b/AcManager/AcManager.csproj
index 3c7c1a4f2..197ea87b3 100644
--- a/AcManager/AcManager.csproj
+++ b/AcManager/AcManager.csproj
@@ -53,7 +53,7 @@
     <TargetZone>LocalIntranet</TargetZone>
   </PropertyGroup>
   <PropertyGroup>
-    <GenerateManifests>true</GenerateManifests>
+    <GenerateManifests>false</GenerateManifests>
   </PropertyGroup>
   <PropertyGroup>
     <ManifestCertificateThumbprint>1C50C8B86DDF7F1AC6E4F6C16886EF163542FF71</ManifestCertificateThumbprint>