diff --git a/src/playbook/Configuration/tweaks.yml b/src/playbook/Configuration/tweaks.yml
index a856f1d8eb..a3ba275e3f 100644
--- a/src/playbook/Configuration/tweaks.yml
+++ b/src/playbook/Configuration/tweaks.yml
@@ -52,6 +52,7 @@ actions:
   - !task: {path: 'tweaks\performance\disable-background-apps.yml'}
   - !task: {path: 'tweaks\performance\disable-fth.yml'}
   - !task: {path: 'tweaks\performance\disable-sleep-study.yml'}
+  - !task: {path: 'tweaks\performance\respect-power-modes-search.yml'}
 
 
   # -------------------------------------------------------------------------- #
diff --git a/src/playbook/Configuration/tweaks/performance/respect-power-modes-search.yml b/src/playbook/Configuration/tweaks/performance/respect-power-modes-search.yml
new file mode 100644
index 0000000000..f212f03cfa
--- /dev/null
+++ b/src/playbook/Configuration/tweaks/performance/respect-power-modes-search.yml
@@ -0,0 +1,9 @@
+---
+title: Respect Power Modes Windows Search Indexing
+description: Enables the option to respect power modes for Windows Search Indexing, to prevent performance loss during gaming or other high-performance tasks
+actions:
+  - !registryValue: 
+    path: 'HKLM\Software\Microsoft\Windows Search\Gather\Windows\SystemIndex'
+    value: 'RespectPowerModes'
+    data: '1'
+    type: REG_DWORD
diff --git a/src/playbook/Executables/AtlasDesktop/3. General Configuration/Search Indexing/Enable Search Indexing.cmd b/src/playbook/Executables/AtlasDesktop/3. General Configuration/Search Indexing/Enable Search Indexing.cmd
index e448c8bb87..8c3b880b29 100644
--- a/src/playbook/Executables/AtlasDesktop/3. General Configuration/Search Indexing/Enable Search Indexing.cmd	
+++ b/src/playbook/Executables/AtlasDesktop/3. General Configuration/Search Indexing/Enable Search Indexing.cmd	
@@ -20,6 +20,9 @@ fltmc > nul 2>&1 || (
 ) > nul
 call "%windir%\AtlasModules\Scripts\settingsPages.cmd" /unhide cortana-windowssearch
 
+:: Respect Power Settings when Search Indexing to prevent performance loss during gaming or other high-performance tasks
+reg add "HKLM\Software\Microsoft\Windows Search\Gather\Windows\SystemIndex" /v "RespectPowerModes" /t REG_DWORD /d "1" /f
+
 if "%~1"=="/silent" exit /b
 echo Finished, please reboot your device for changes to apply.
 pause