diff --git a/Natives/customcontrols/CustomControlsUtils.m b/Natives/customcontrols/CustomControlsUtils.m
index 0154ba2e..6ef609cc 100644
--- a/Natives/customcontrols/CustomControlsUtils.m
+++ b/Natives/customcontrols/CustomControlsUtils.m
@@ -311,7 +311,7 @@ void generateAndSaveDefaultControl() {
 }
 
 void generateAndSaveDefaultControlForGamepad() {
-    NSString *gamepadPath = [NSString stringWithFormat:@"%s/controlmap/gamepad-default.json", getenv("POJAV_HOME")];
+    NSString *gamepadPath = [NSString stringWithFormat:@"%s/controlmap/gamepads/gamepad-default.json", getenv("POJAV_HOME")];
     if ([NSFileManager.defaultManager fileExistsAtPath:gamepadPath]) {
         return;
     }
diff --git a/Natives/main.m b/Natives/main.m
index 6b5edbb5..cbd450cc 100644
--- a/Natives/main.m
+++ b/Natives/main.m
@@ -242,6 +242,8 @@ void init_setupCustomControls() {
     NSString *controlPath = [@(getenv("POJAV_HOME")) stringByAppendingPathComponent:@"controlmap"];
     [fm createDirectoryAtPath:controlPath withIntermediateDirectories:NO attributes:nil error:nil];
     generateAndSaveDefaultControl();
+    NSString *gamepadControlPath = [controlPath stringByAppendingPathComponent:@"gamepads"];
+    [fm createDirectoryAtPath:gamepadControlPath withIntermediateDirectories:NO attributes:nil error:nil];
     generateAndSaveDefaultControlForGamepad();
 }
 
diff --git a/Natives/resources/Assets.car b/Natives/resources/Assets.car
index 6acece54..50349590 100644
Binary files a/Natives/resources/Assets.car and b/Natives/resources/Assets.car differ