diff --git a/src/SamplesApp/UITests.Shared/UITests.Shared.projitems b/src/SamplesApp/UITests.Shared/UITests.Shared.projitems
index 176ea36b8b3f..d59d12e62c59 100644
--- a/src/SamplesApp/UITests.Shared/UITests.Shared.projitems
+++ b/src/SamplesApp/UITests.Shared/UITests.Shared.projitems
@@ -1414,10 +1414,6 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="$(MSBuildThisFileDirectory)Windows_UI_Xaml_Controls\AutoSuggestBoxTests\AutoSuggestBox_PopupFocus.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
     <Page Include="$(MSBuildThisFileDirectory)Windows_UI_Xaml_Controls\AutoSuggestBoxTests\AutoSuggestBox_Icons.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -6562,9 +6558,6 @@
     <Compile Include="$(MSBuildThisFileDirectory)Windows_UI_Xaml_Controls\AutoSuggestBoxTests\AutoSuggestBox_Description.xaml.cs">
       <DependentUpon>AutoSuggestBox_Description.xaml</DependentUpon>
     </Compile>
-    <Compile Include="$(MSBuildThisFileDirectory)Windows_UI_Xaml_Controls\AutoSuggestBoxTests\AutoSuggestBox_PopupFocus.xaml.cs">
-      <DependentUpon>AutoSuggestBox_PopupFocus.xaml</DependentUpon>
-    </Compile>
     <Compile Include="$(MSBuildThisFileDirectory)Windows_UI_Xaml_Controls\AutoSuggestBoxTests\AutoSuggestBox_Icons.xaml.cs">
       <DependentUpon>AutoSuggestBox_Icons.xaml</DependentUpon>
     </Compile>
diff --git a/src/SamplesApp/UITests.Shared/Windows_UI_Xaml_Controls/AutoSuggestBoxTests/AutoSuggestBox_PopupFocus.xaml b/src/SamplesApp/UITests.Shared/Windows_UI_Xaml_Controls/AutoSuggestBoxTests/AutoSuggestBox_PopupFocus.xaml
deleted file mode 100644
index e87af73d130d..000000000000
--- a/src/SamplesApp/UITests.Shared/Windows_UI_Xaml_Controls/AutoSuggestBoxTests/AutoSuggestBox_PopupFocus.xaml
+++ /dev/null
@@ -1,38 +0,0 @@
-<Page
-    x:Class="UITests.Windows_UI_Xaml_Controls.AutoSuggestBoxTests.AutoSuggestBox_PopupFocus"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:UITests.Windows_UI_Xaml_Controls.AutoSuggestBoxTests"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    mc:Ignorable="d"
-    Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
-
-	<StackPanel>
-		<Button Content="Click me">
-			<Button.Flyout>
-				<Flyout>
-					<StackPanel>
-						<TextBlock>
-							Repro Steps:
-							<LineBreak/>
-							1. Click on the TextBox below. The textbox should look focused
-							<LineBreak/>
-							(i.e.light blue bottom border).
-							<LineBreak/>
-							2. Type the character "T". A suggestions list should pop up
-							<LineBreak/>
-							with a single item, "test".
-						</TextBlock>
-						<AutoSuggestBox PlaceholderText="type some text">
-							<AutoSuggestBox.Items>
-								<x:String>test</x:String>
-							</AutoSuggestBox.Items>
-						</AutoSuggestBox>
-						<TextBox />
-					</StackPanel>
-				</Flyout>
-			</Button.Flyout>
-		</Button>
-	</StackPanel>
-</Page>
diff --git a/src/SamplesApp/UITests.Shared/Windows_UI_Xaml_Controls/AutoSuggestBoxTests/AutoSuggestBox_PopupFocus.xaml.cs b/src/SamplesApp/UITests.Shared/Windows_UI_Xaml_Controls/AutoSuggestBoxTests/AutoSuggestBox_PopupFocus.xaml.cs
deleted file mode 100644
index a15b251f5cb3..000000000000
--- a/src/SamplesApp/UITests.Shared/Windows_UI_Xaml_Controls/AutoSuggestBoxTests/AutoSuggestBox_PopupFocus.xaml.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using Uno.UI.Samples.Controls;
-using Microsoft.UI.Xaml.Controls;
-
-namespace UITests.Windows_UI_Xaml_Controls.AutoSuggestBoxTests;
-
-[Sample("AutoSuggestBox", IsManualTest = true)]
-public sealed partial class AutoSuggestBox_PopupFocus : Page
-{
-	public AutoSuggestBox_PopupFocus()
-	{
-		this.InitializeComponent();
-	}
-}
diff --git a/src/Uno.UI.RuntimeTests/Tests/Windows_UI_Xaml_Controls/Given_TextBox.cs b/src/Uno.UI.RuntimeTests/Tests/Windows_UI_Xaml_Controls/Given_TextBox.cs
index a25f8b786c71..a34dd21378a8 100644
--- a/src/Uno.UI.RuntimeTests/Tests/Windows_UI_Xaml_Controls/Given_TextBox.cs
+++ b/src/Uno.UI.RuntimeTests/Tests/Windows_UI_Xaml_Controls/Given_TextBox.cs
@@ -28,6 +28,7 @@
 using Windows.UI.Input.Preview.Injection;
 using Windows.Foundation;
 using System.Collections.Generic;
+using Uno.Extensions;
 
 
 #if WINAPPSDK
@@ -1124,6 +1125,44 @@ static FrameworkElement GetSCP(TextBox tb)
 		}
 #endif
 
+#if HAS_UNO
+		[TestMethod]
+		[UnoWorkItem("https://github.com/unoplatform/uno/issues/18790")]
+#if !HAS_INPUT_INJECTOR
+		[Ignore("InputInjector is not supported on this platform.")]
+#endif
+		public async Task When_Clicked_In_Popup()
+		{
+			TextBox tb;
+			var btn = new Button
+			{
+				Flyout = new Flyout
+				{
+					Content = tb = new TextBox()
+				}
+			};
+
+			await UITestHelper.Load(btn);
+
+			var injector = InputInjector.TryCreate() ?? throw new InvalidOperationException("Failed to init the InputInjector");
+			using var mouse = injector.GetMouse();
+
+			mouse.Press(btn.GetAbsoluteBoundsRect().GetCenter());
+			await UITestHelper.WaitForIdle();
+			mouse.Release();
+			await UITestHelper.WaitForIdle();
+
+			Assert.IsTrue(btn.Flyout.IsOpen);
+
+			mouse.Press(tb.GetAbsoluteBoundsRect().GetCenter());
+			await UITestHelper.WaitForIdle();
+			mouse.Release();
+			await UITestHelper.WaitForIdle();
+
+			Assert.AreEqual(tb, FocusManager.GetFocusedElement(WindowHelper.XamlRoot));
+		}
+#endif
+
 		private static async Task<TextBox> LoadZeroSizeTextBoxAsync(Style style)
 		{
 			var loaded = false;
diff --git a/src/Uno.UI/UI/Xaml/Controls/ScrollViewer/ScrollViewer.cs b/src/Uno.UI/UI/Xaml/Controls/ScrollViewer/ScrollViewer.cs
index d6c17d460f8b..ff8b34c65ab3 100644
--- a/src/Uno.UI/UI/Xaml/Controls/ScrollViewer/ScrollViewer.cs
+++ b/src/Uno.UI/UI/Xaml/Controls/ScrollViewer/ScrollViewer.cs
@@ -593,17 +593,6 @@ public double HorizontalOffset
 			);
 		#endregion
 
-#if __WASM__
-		/// <summary>
-		/// This is specifically added for ScrollViewers inside TextBoxes and specifically for WASM
-		/// On WASM, a click on a TextBox inside a popup shifts focus to the Popup instead of the TextBox
-		/// as a result of ScrollContentControl_SetFocusOnFlyoutLightDismissPopupByPointer.
-		/// This is only a problem on WASM because we don't capture the pointer when pressing inside a TextBox
-		/// <seealso cref="TextBox.IsPointerCaptureRequired"/>.
-		/// </summary>
-		internal bool DisableSetFocusOnPopupByPointer { get; set; }
-#endif
-
 		private readonly SerialDisposable _sizeChangedSubscription = new SerialDisposable();
 
 #pragma warning disable 649 // unused member for Unit tests
diff --git a/src/Uno.UI/UI/Xaml/Controls/ScrollViewer/ScrollViewer.wasm.cs b/src/Uno.UI/UI/Xaml/Controls/ScrollViewer/ScrollViewer.wasm.cs
index e709cb5ac605..185369d583cd 100644
--- a/src/Uno.UI/UI/Xaml/Controls/ScrollViewer/ScrollViewer.wasm.cs
+++ b/src/Uno.UI/UI/Xaml/Controls/ScrollViewer/ScrollViewer.wasm.cs
@@ -11,6 +11,15 @@ namespace Microsoft.UI.Xaml.Controls
 {
 	partial class ScrollViewer
 	{
+		/// <summary>
+		/// This is specifically added for ScrollViewers inside TextBoxes and specifically for WASM
+		/// On WASM, a click on a TextBox inside a popup shifts focus to the Popup instead of the TextBox
+		/// as a result of ScrollContentControl_SetFocusOnFlyoutLightDismissPopupByPointer.
+		/// This is only a problem on WASM because we don't capture the pointer when pressing inside a TextBox
+		/// <seealso cref="TextBox.IsPointerCaptureRequired"/>.
+		/// </summary>
+		internal bool DisableSetFocusOnPopupByPointer { get; set; }
+
 		internal bool CancelNextNativeScroll { get; private set; }
 		internal Size ScrollBarSize => (_presenter as ScrollContentPresenter)?.ScrollBarSize ?? default;