diff --git a/src/MeloNX/MeloNX.xcodeproj/project.xcworkspace/xcuserdata/stossy11.xcuserdatad/UserInterfaceState.xcuserstate b/src/MeloNX/MeloNX.xcodeproj/project.xcworkspace/xcuserdata/stossy11.xcuserdatad/UserInterfaceState.xcuserstate
index 4b5a5da7c..5919120d2 100644
Binary files a/src/MeloNX/MeloNX.xcodeproj/project.xcworkspace/xcuserdata/stossy11.xcuserdatad/UserInterfaceState.xcuserstate and b/src/MeloNX/MeloNX.xcodeproj/project.xcworkspace/xcuserdata/stossy11.xcuserdatad/UserInterfaceState.xcuserstate differ
diff --git a/src/MeloNX/MeloNX/App/Views/ContentView.swift b/src/MeloNX/MeloNX/App/Views/ContentView.swift
index b333c872f..85b4d0fc1 100644
--- a/src/MeloNX/MeloNX/App/Views/ContentView.swift
+++ b/src/MeloNX/MeloNX/App/Views/ContentView.swift
@@ -33,7 +33,7 @@ struct ContentView: View {
     @AppStorage("JIT") var isJITEnabled: Bool = false
     @State var isMK8: Bool = false
     @AppStorage("quit") var quit: Bool = false
-    @AppStorage("MVK_CONFIG_PREFILL_METAL_COMMAND_BUFFERS") var mVKPreFillBuffer: Bool = false
+    @AppStorage("MVK_CONFIG_PREFILL_METAL_COMMAND_BUFFERS") var mVKPreFillBuffer: Bool = true
     
     @State var quits: Bool = false
     @State private var clumpOffset: CGFloat = -100
@@ -53,7 +53,6 @@ struct ContentView: View {
             MoltenVKSettings(string: "MVK_USE_METAL_PRIVATE_API", value: "0"),
             // MoltenVKSettings(string: "MVK_CONFIG_RESUME_LOST_DEVICE", value: "1"),
             MoltenVKSettings(string: "MVK_CONFIG_MAX_ACTIVE_METAL_COMMAND_BUFFERS_PER_QUEUE", value: "192"),
-            MoltenVKSettings(string: "MVK_CONFIG_PREFILL_METAL_COMMAND_BUFFERS", value: "2"),
             //MVK_CONFIG_LOG_LEVEL
             MoltenVKSettings(string: "MVK_CONFIG_USE_METAL_PRIVATE_API", value: "0")
         ]
@@ -288,6 +287,10 @@ struct ContentView: View {
         config.gamepath = game.fileURL.path
         config.inputids = Array(Set(currentControllers.map(\.id)))
         
+        if mVKPreFillBuffer {
+            let setting = MoltenVKSettings(string: "MVK_CONFIG_PREFILL_METAL_COMMAND_BUFFERS", value: "2")
+            setenv(setting.string, setting.value, 1)
+        }
         
         if config.inputids.isEmpty {
             config.inputids.append("0")
diff --git a/src/MeloNX/MeloNX/App/Views/SettingsView/SettingsView.swift b/src/MeloNX/MeloNX/App/Views/SettingsView/SettingsView.swift
index c53af457c..153263bec 100644
--- a/src/MeloNX/MeloNX/App/Views/SettingsView/SettingsView.swift
+++ b/src/MeloNX/MeloNX/App/Views/SettingsView/SettingsView.swift
@@ -374,9 +374,9 @@ struct SettingsView: View {
                 Section {
                     DisclosureGroup {
                         
-                        // Toggle(isOn: $mVKPreFillBuffer) {
-                            // labelWithIcon("MVK: Pre-Fill Metal Command Buffers", iconName: "gearshape")
-                        // }.tint(.blue)
+                        Toggle(isOn: $mVKPreFillBuffer) {
+                            labelWithIcon("MVK: Pre-Fill Metal Command Buffers", iconName: "gearshape")
+                        }.tint(.blue)
                         
                         HStack {
                             labelWithIcon("Page Size", iconName: "textformat.size")