diff --git a/src/common/UITestAutomation/Session.cs b/src/common/UITestAutomation/Session.cs
index e6d6448c26..7de3ff3978 100644
--- a/src/common/UITestAutomation/Session.cs
+++ b/src/common/UITestAutomation/Session.cs
@@ -33,6 +33,11 @@ namespace Microsoft.PowerToys.UITest
         /// </summary>
         public IntPtr MainWindowHandler { get; private set; }
 
+        /// <summary>
+        /// Gets Init Scope
+        /// </summary>
+        public PowerToysModule InitScope { get; private set; }
+
         /// <summary>
         /// Gets the RunAsAdmin flag.
         /// If true, the session is running as admin.
@@ -46,9 +51,13 @@ namespace Microsoft.PowerToys.UITest
             this.MainWindowHandler = IntPtr.Zero;
             this.Root = root;
             this.WindowsDriver = windowsDriver;
+            this.InitScope = scope;
 
-            // Attach to the scope & reset MainWindowHandler
-            this.Attach(scope, size);
+            if (size != WindowSize.UnSpecified)
+            {
+                // Attach to the scope & reset MainWindowHandler
+                this.Attach(scope, size);
+            }
         }
 
         /// <summary>
@@ -382,6 +391,12 @@ namespace Microsoft.PowerToys.UITest
         /// <param name="height">the height in pixel</param>
         public void SetMainWindowSize(int width, int height)
         {
+            if (this.MainWindowHandler == IntPtr.Zero)
+            {
+                // Attach to the scope & reset MainWindowHandler
+                this.Attach(this.InitScope);
+            }
+
             if (this.MainWindowHandler == IntPtr.Zero
                 || width <= 0
                 || height <= 0)
diff --git a/src/modules/MouseUtils/MouseUtils.UITests/FindMyMouseTests.cs b/src/modules/MouseUtils/MouseUtils.UITests/FindMyMouseTests.cs
index 2ed67f4895..42b2e4c097 100644
--- a/src/modules/MouseUtils/MouseUtils.UITests/FindMyMouseTests.cs
+++ b/src/modules/MouseUtils/MouseUtils.UITests/FindMyMouseTests.cs
@@ -178,7 +178,77 @@ namespace MouseUtils.UITests
             {
                 foundCustom.Find<ToggleSwitch>("Enable Find My Mouse").Toggle(true);
 
-                // foundCustom.Find<ToggleSwitch>("Enable Find My Mouse").Toggle(false);
+                foundCustom.Find<ToggleSwitch>("Enable Find My Mouse").Toggle(false);
+
+                foundCustom.Find<ToggleSwitch>("Enable Find My Mouse").Toggle(true);
+                SetFindMyMouseActivationMethod(ref foundCustom, "Press Left Control twice");
+                Assert.IsNotNull(foundCustom);
+                SetFindMyMouseAppearanceBehavior(ref foundCustom, ref settings);
+
+                var excludedApps = foundCustom.Find<TextBlock>("Excluded apps");
+                if (excludedApps != null)
+                {
+                    excludedApps.Click();
+                    excludedApps.Click();
+                }
+                else
+                {
+                    Assert.Fail("Activation method group not found.");
+                }
+            }
+            else
+            {
+                Assert.Fail("Find My Mouse group not found.");
+            }
+
+            // [Test Case]Enable FindMyMouse. Then, without moving your mouse: Press Left Ctrl twice and verify the overlay appears.
+            // VerifySpotlightSettings(ref settings);
+            ActivateSpotlight(ref settings);
+            VerifySpotlightAppears(ref settings);
+
+            // [Test Case] Disable FindMyMouse. Verify the overlay no longer appears when you press Left Ctrl twice
+            foundCustom.Find<ToggleSwitch>("Enable Find My Mouse").Toggle(false);
+            Task.Delay(1000).Wait();
+            ActivateSpotlight(ref settings);
+
+            VerifySpotlightDisappears(ref settings);
+
+            // [Test Case] Press Left Ctrl twice and verify the overlay appears
+            foundCustom.Find<ToggleSwitch>("Enable Find My Mouse").Toggle(true);
+            ActivateSpotlight(ref settings);
+            VerifySpotlightAppears(ref settings);
+
+            Session.PerformMouseAction(MouseActionType.LeftClick);
+        }
+
+        [TestMethod]
+        public void TestDisableFindMyMouse3()
+        {
+            LaunchFromSetting();
+
+            var settings = new FindMyMouseSettings();
+            settings.OverlayOpacity = "100";
+            settings.Radius = "50";
+            settings.InitialZoom = "1";
+            settings.AnimationDuration = "0";
+            settings.BackgroundColor = "000000";
+            settings.SpotlightColor = "FFFFFF";
+            var foundCustom = this.Find<Custom>("Find My Mouse");
+
+            Assert.IsNotNull(foundCustom);
+
+            if (CheckAnimationEnable(ref foundCustom))
+            {
+                foundCustom = this.Find<Custom>("Find My Mouse");
+            }
+
+            if (foundCustom != null)
+            {
+                foundCustom.Find<ToggleSwitch>("Enable Find My Mouse").Toggle(true);
+
+                foundCustom.Find<ToggleSwitch>("Enable Find My Mouse").Toggle(false);
+
+                foundCustom.Find<ToggleSwitch>("Enable Find My Mouse").Toggle(true);
                 SetFindMyMouseActivationMethod(ref foundCustom, "Press Left Control twice");
                 Assert.IsNotNull(foundCustom);
                 SetFindMyMouseAppearanceBehavior(ref foundCustom, ref settings);
diff --git a/src/modules/MouseUtils/MouseUtils.UITests/MouseHighlighterTests.cs b/src/modules/MouseUtils/MouseUtils.UITests/MouseHighlighterTests.cs
index ae889e417c..72f73d6886 100644
--- a/src/modules/MouseUtils/MouseUtils.UITests/MouseHighlighterTests.cs
+++ b/src/modules/MouseUtils/MouseUtils.UITests/MouseHighlighterTests.cs
@@ -129,6 +129,120 @@ namespace MouseUtils.UITests
             Task.Delay(500).Wait();
         }
 
+        [TestMethod]
+        public void TestEnableMouseHighlighter2()
+        {
+            LaunchFromSetting();
+            var foundCustom0 = this.Find<Custom>("Find My Mouse");
+            if (foundCustom0 != null)
+            {
+                foundCustom0.Find<ToggleSwitch>("Enable Find My Mouse").Toggle(false);
+            }
+            else
+            {
+                Assert.Fail("Find My Mouse custom not found.");
+            }
+
+            var settings = new MouseHighlighterSettings();
+            settings.PrimaryButtonHighlightColor = "FFFF0000";
+            settings.SecondaryButtonHighlightColor = "FF00FF00";
+            settings.AlwaysHighlightColor = "004cFF71";
+            settings.Radius = "50";
+            settings.FadeDelay = "0";
+            settings.FadeDuration = "90";
+
+            var foundCustom = this.Find<Custom>("Mouse Highlighter");
+            if (foundCustom != null)
+            {
+                foundCustom.Find<ToggleSwitch>("Enable Mouse Highlighter").Toggle(true);
+                foundCustom.Find<ToggleSwitch>("Enable Mouse Highlighter").Toggle(false);
+
+                var xy = Session.GetMousePosition();
+                Session.MoveMouseTo(xy.Item1, xy.Item2 - 100);
+
+                Session.PerformMouseAction(MouseActionType.ScrollDown);
+                Session.PerformMouseAction(MouseActionType.ScrollDown);
+                Session.PerformMouseAction(MouseActionType.ScrollDown);
+                foundCustom.Find<ToggleSwitch>("Enable Mouse Highlighter").Toggle(true);
+
+                // Change the shortcut key for MouseHighlighter
+                // [TestCase]Change activation shortcut and test it
+                var activationShortcutButton = foundCustom.Find<Button>("Activation shortcut");
+                Assert.IsNotNull(activationShortcutButton);
+
+                activationShortcutButton.Click();
+                Task.Delay(500).Wait();
+                var activationShortcutWindow = Session.Find<Window>("Activation shortcut");
+                Assert.IsNotNull(activationShortcutWindow);
+
+                // Invalid shortcut key
+                Session.SendKeySequence(Key.H);
+
+                // IOUtil.SimulateKeyPress(0x41);
+                var invalidShortcutText = activationShortcutWindow.Find<TextBlock>("Invalid shortcut");
+                Assert.IsNotNull(invalidShortcutText);
+
+                // IOUtil.SimulateShortcut(0x5B, 0x10, 0x45);
+                Session.SendKeys(Key.Win, Key.Shift, Key.H);
+
+                // Assert.IsNull(activationShortcutWindow.Find<TextBlock>("Invalid shortcut"));
+                var saveButton = activationShortcutWindow.Find<Button>("Save");
+                Assert.IsNotNull(saveButton);
+                saveButton.Click(false, 500, 1000);
+
+                SetMouseHighlighterAppearanceBehavior(ref foundCustom, ref settings);
+
+                var xy0 = Session.GetMousePosition();
+                Session.MoveMouseTo(xy0.Item1 - 100, xy0.Item2);
+                Session.PerformMouseAction(MouseActionType.LeftClick);
+
+                // Check the mouse highlighter is enabled
+                Session.SendKeys(Key.Win, Key.Shift, Key.H);
+
+                // IOUtil.SimulateShortcut(0x5B, 0x10, 0x45);
+                Task.Delay(1000).Wait();
+
+                // MouseSimulator.LeftClick();
+                // [Test Case] Press the activation shortcut and press left and right click somewhere, verifying the highlights are applied.
+                // [Test Case] Press the activation shortcut again and verify no highlights appear when the mouse buttons are clicked.
+                VerifyMouseHighlighterAppears(ref settings, "leftClick");
+                VerifyMouseHighlighterAppears(ref settings, "rightClick");
+
+                // Disable mouse highlighter
+                Session.SendKeys(Key.Win, Key.Shift, Key.H);
+                Task.Delay(1000).Wait();
+
+                VerifyMouseHighlighterNotAppears(ref settings, "leftClick");
+                VerifyMouseHighlighterNotAppears(ref settings, "rightClick");
+
+                // [Test Case] Disable Mouse Highlighter and verify that the module is not activated when you press the activation shortcut.
+                foundCustom.Find<ToggleSwitch>("Enable Mouse Highlighter").Toggle(false);
+                xy = Session.GetMousePosition();
+                Session.MoveMouseTo(xy.Item1 - 100, xy.Item2);
+
+                Session.SendKeys(Key.Win, Key.Shift, Key.H);
+                Task.Delay(1000).Wait();
+
+                VerifyMouseHighlighterNotAppears(ref settings, "leftClick");
+                VerifyMouseHighlighterNotAppears(ref settings, "rightClick");
+
+                foundCustom.Find<ToggleSwitch>("Enable Mouse Highlighter").Toggle(true);
+                xy = Session.GetMousePosition();
+                Session.MoveMouseTo(xy.Item1 - 100, xy.Item2);
+
+                Session.SendKeys(Key.Win, Key.Shift, Key.H);
+                Task.Delay(1000).Wait();
+                VerifyMouseHighlighterDrag(ref settings, "leftClick");
+                VerifyMouseHighlighterDrag(ref settings, "rightClick");
+            }
+            else
+            {
+                Assert.Fail("Mouse Highlighter Custom not found.");
+            }
+
+            Task.Delay(500).Wait();
+        }
+
         private void VerifyMouseHighlighterDrag(ref MouseHighlighterSettings settings, string action = "leftClick")
         {
             Task.Delay(500).Wait();
diff --git a/src/modules/MouseUtils/MouseUtils.UITests/MouseJumpTests.cs b/src/modules/MouseUtils/MouseUtils.UITests/MouseJumpTests.cs
index 113f92f84b..aecc799cf9 100644
--- a/src/modules/MouseUtils/MouseUtils.UITests/MouseJumpTests.cs
+++ b/src/modules/MouseUtils/MouseUtils.UITests/MouseJumpTests.cs
@@ -14,6 +14,12 @@ namespace MouseUtils.UITests
     {
         [TestMethod]
         public void TestEnableMouseJump()
+        {
+            LaunchFromSetting(true);
+        }
+
+        [TestMethod]
+        public void TestEnableMouseJump2()
         {
             LaunchFromSetting();
             var foundCustom0 = this.Find<Custom>("Find My Mouse");
@@ -124,7 +130,7 @@ namespace MouseUtils.UITests
             return Math.Sqrt((dx * dx) + (dy * dy));
         }
 
-        private void LaunchFromSetting(bool showWarning = false, bool launchAsAdmin = false)
+        private void LaunchFromSetting(bool firstTime = false, bool launchAsAdmin = false)
         {
             Session.SetMainWindowSize(WindowSize.Large);
             Task.Delay(1000).Wait();
@@ -134,11 +140,19 @@ namespace MouseUtils.UITests
             {
                 // Expand Advanced list-group if needed
                 this.Find<NavigationViewItem>("Input / Output").ClickCenter();
+                Task.Delay(2000).Wait();
             }
 
             // Click on the Mouse utilities
-            Task.Delay(2000).Wait();
-            this.Find<NavigationViewItem>("Mouse utilities").Click();
+            // Task.Delay(2000).Wait();
+            if (firstTime)
+            {
+                return;
+            }
+            else
+            {
+                this.Find<NavigationViewItem>("Mouse utilities").Click();
+            }
         }
     }
 }