diff --git a/Get.ps1 b/Get.ps1
index 32a6575..19d24fa 100644
--- a/Get.ps1
+++ b/Get.ps1
@@ -17,7 +17,7 @@ param (
     [switch]$RemoveW11Outlook,
     [switch]$ForceRemoveEdge,
     [switch]$DisableDVR,
-    [switch]$DisableControllerOverlay,
+    [switch]$DisableGameBarIntegration,
     [switch]$DisableTelemetry,
     [switch]$DisableFastStartup,
     [switch]$DisableModernStandbyNetworking,
diff --git a/Regfiles/Disable_Controller_Game_Bar_Integration.reg b/Regfiles/Disable_Controller_Game_Bar_Integration.reg
deleted file mode 100644
index 4c3faae..0000000
--- a/Regfiles/Disable_Controller_Game_Bar_Integration.reg
+++ /dev/null
@@ -1,5 +0,0 @@
-Windows Registry Editor Version 5.00
-
-; Disable allow your controller to open Game Bar
-[HKEY_CURRENT_USER\SOFTWARE\Microsoft\GameBar]
-"UseNexusForGameBarEnabled"=dword:00000000
diff --git a/Regfiles/Disable_Game_Bar_Integration.reg b/Regfiles/Disable_Game_Bar_Integration.reg
new file mode 100644
index 0000000..5446951
--- /dev/null
+++ b/Regfiles/Disable_Game_Bar_Integration.reg
@@ -0,0 +1,22 @@
+Windows Registry Editor Version 5.00
+
+; Disable allow your controller to open Game Bar
+[HKEY_CURRENT_USER\SOFTWARE\Microsoft\GameBar]
+"UseNexusForGameBarEnabled"=dword:00000000
+
+; Disable `ms-gamebar` popups
+[HKEY_CLASSES_ROOT\ms-gamebar]
+@="URL:ms-gamebar"
+"URL Protocol"=""
+"NoOpenWith"=""
+
+[HKEY_CLASSES_ROOT\ms-gamebar\shell\open\command]
+@="%SystemRoot%/System32/systray.exe"
+
+[HKEY_CLASSES_ROOT\ms-gamebarservices]
+@="URL:ms-gamebar"
+"URL Protocol"=""
+"NoOpenWith"=""
+
+[HKEY_CLASSES_ROOT\ms-gamebarservices\shell\open\command]
+@="%SystemRoot%/System32/systray.exe"
diff --git a/Regfiles/Sysprep/Disable_Controller_Game_Bar_Integration.reg b/Regfiles/Sysprep/Disable_Controller_Game_Bar_Integration.reg
deleted file mode 100644
index 16ab54f..0000000
--- a/Regfiles/Sysprep/Disable_Controller_Game_Bar_Integration.reg
+++ /dev/null
@@ -1,5 +0,0 @@
-Windows Registry Editor Version 5.00
-
-; Disable allow your controller to open Game Bar
-[hkey_users\default\SOFTWARE\Microsoft\GameBar]
-"UseNexusForGameBarEnabled"=dword:00000000
diff --git a/Regfiles/Sysprep/Disable_Game_Bar_Integration.reg b/Regfiles/Sysprep/Disable_Game_Bar_Integration.reg
new file mode 100644
index 0000000..421a6c2
--- /dev/null
+++ b/Regfiles/Sysprep/Disable_Game_Bar_Integration.reg
@@ -0,0 +1,22 @@
+Windows Registry Editor Version 5.00
+
+; Disable allow your controller to open Game Bar
+[hkey_users\default\SOFTWARE\Microsoft\GameBar]
+"UseNexusForGameBarEnabled"=dword:00000000
+
+; Disable `ms-gamebar` popups
+[HKEY_CLASSES_ROOT\ms-gamebar]
+@="URL:ms-gamebar"
+"URL Protocol"=""
+"NoOpenWith"=""
+
+[HKEY_CLASSES_ROOT\ms-gamebar\shell\open\command]
+@="%SystemRoot%/System32/systray.exe"
+
+[HKEY_CLASSES_ROOT\ms-gamebarservices]
+@="URL:ms-gamebar"
+"URL Protocol"=""
+"NoOpenWith"=""
+
+[HKEY_CLASSES_ROOT\ms-gamebar\shell\open\command]
+@="%SystemRoot%/System32/systray.exe"
\ No newline at end of file
diff --git a/Regfiles/Undo/Enable_Controller_Game_Bar_Integration.reg b/Regfiles/Undo/Enable_Controller_Game_Bar_Integration.reg
deleted file mode 100644
index d8beb93..0000000
--- a/Regfiles/Undo/Enable_Controller_Game_Bar_Integration.reg
+++ /dev/null
@@ -1,5 +0,0 @@
-Windows Registry Editor Version 5.00
-
-; Enable allow your controller to open Game Bar
-[HKEY_CURRENT_USER\SOFTWARE\Microsoft\GameBar]
-"UseNexusForGameBarEnabled"=dword:00000001
diff --git a/Regfiles/Undo/Enable_Game_Bar_Integration.reg b/Regfiles/Undo/Enable_Game_Bar_Integration.reg
new file mode 100644
index 0000000..8e70504
--- /dev/null
+++ b/Regfiles/Undo/Enable_Game_Bar_Integration.reg
@@ -0,0 +1,20 @@
+Windows Registry Editor Version 5.00
+
+; Enable allow your controller to open Game Bar
+[HKEY_CURRENT_USER\SOFTWARE\Microsoft\GameBar]
+"UseNexusForGameBarEnabled"=dword:00000001
+
+; Enable `ms-gamebar` popups
+[HKEY_CLASSES_ROOT\ms-gamebar]
+@="URL:ms-gamebar"
+"URL Protocol"=""
+"NoOpenWith"=-
+
+[-HKEY_CLASSES_ROOT\ms-gamebar\shell\open\command]
+
+[HKEY_CLASSES_ROOT\ms-gamebarservices]
+@="URL:ms-gamebar"
+"URL Protocol"=""
+"NoOpenWith"=-
+
+[-HKEY_CLASSES_ROOT\ms-gamebar\shell\open\command]
\ No newline at end of file
diff --git a/Win11Debloat.ps1 b/Win11Debloat.ps1
index bd13ed7..cfcd2c2 100755
--- a/Win11Debloat.ps1
+++ b/Win11Debloat.ps1
@@ -19,7 +19,7 @@ param (
     [switch]$RemoveW11Outlook,
     [switch]$ForceRemoveEdge,
     [switch]$DisableDVR,
-    [switch]$DisableControllerOverlay,
+    [switch]$DisableGameBarIntegration,
     [switch]$DisableTelemetry,
     [switch]$DisableFastStartup,
     [switch]$DisableModernStandbyNetworking,
@@ -991,7 +991,7 @@ function DisplayCustomModeOptions {
             AddParameter 'RemoveW11Outlook' 'Remove the new Outlook for Windows app'
             AddParameter 'RemoveGamingApps' 'Remove the Xbox App and Xbox Gamebar'
             AddParameter 'DisableDVR' 'Disable Xbox game/screen recording'
-            AddParameter 'DisableControllerOverlay' 'Disable opening the Xbox Game Bar with a controller'
+            AddParameter 'DisableGameBarIntegration' 'Disable Game Bar integration'
         }
         '3' {
             Write-Output "You have selected $($script:SelectedApps.Count) apps for removal"
@@ -1000,9 +1000,9 @@ function DisplayCustomModeOptions {
 
             Write-Output ""
 
-            if ($( Read-Host -Prompt "Disable Game Bar integration for controller and game/screen recording? This also stops msgaming overlay popups (y/n)" ) -eq 'y') {
+            if ($( Read-Host -Prompt "Disable Game Bar integration and game/screen recording? This also stops ms-gamingoverlay and ms-gamebar popups (y/n)" ) -eq 'y') {
                 AddParameter 'DisableDVR' 'Disable Xbox game/screen recording'
-                AddParameter 'DisableControllerOverlay' 'Disable opening the Xbox Game Bar with a controller'
+                AddParameter 'DisableGameBarIntegration' 'Disable Game Bar integration'
             }
         }
     }
@@ -1811,8 +1811,8 @@ switch ($script:Params.Keys) {
         RegImport "> Disabling Xbox game/screen recording..." "Disable_DVR.reg"
         continue
     }
-    'DisableControllerOverlay' {
-        RegImport "> Disabling the option of opening the Xbox Game Bar with a controller..." "Disable_Controller_Game_Bar_Integration.reg"
+    'DisableGameBarIntegration' {
+        RegImport "> Disabling the option of opening the Xbox Game Bar with a controller..." "Disable_Game_Bar_Integration.reg"
         continue
     }
     'DisableTelemetry' {