diff --git a/StikJIT/Views/HomeView.swift b/StikJIT/Views/HomeView.swift
index 89f78ffd..46097515 100644
--- a/StikJIT/Views/HomeView.swift
+++ b/StikJIT/Views/HomeView.swift
@@ -303,7 +303,10 @@ struct HomeView: View {
                 startJITInBackground(with: selectedBundle)
             }
         }
-        .pipify(isPresented: $isProcessing) {
+        .pipify(isPresented: Binding(
+            get: { useDefaultScript && isProcessing },
+            set: { newValue in isProcessing = newValue }
+        )) {
             RunJSViewPiP(model: $jsModel)
         }
         .sheet(isPresented: $scriptViewShow) {
diff --git a/StikJIT/Views/SettingsView.swift b/StikJIT/Views/SettingsView.swift
index 3f817898..8189fe87 100644
--- a/StikJIT/Views/SettingsView.swift
+++ b/StikJIT/Views/SettingsView.swift
@@ -272,16 +272,23 @@ struct SettingsView: View {
                                                    .foregroundColor(.primary)
                                                    .padding(.bottom, 4)
                                                
-                                               Toggle("Run Default Script After Connecting", isOn: $useDefaultScript)
-                                                   .foregroundColor(.primary)
-                                                   .padding(.vertical, 6)
-
                                                Toggle("Enable Advanced Options", isOn: $enableAdvancedOptions)
                                                    .foregroundColor(.primary)
                                                    .padding(.vertical, 6)
+
+                                               if enableAdvancedOptions {
+                                                   Toggle("Run Default Script After Connecting", isOn: $useDefaultScript)
+                                                       .foregroundColor(.primary)
+                                                       .padding(.vertical, 6)
+                                               }
                                            }
                                            .padding(.vertical, 20)
                                            .padding(.horizontal, 16)
+                                           .onChange(of: enableAdvancedOptions) { _, newValue in
+                                               if !newValue {
+                                                   useDefaultScript = false
+                                               }
+                                           }
                                        }
                                        
                     // About section