diff --git a/src/SamplesApp/SamplesApp.UnitTests.Shared/Controls/UITests/Presentation/SampleChooserViewMode.Properties.cs b/src/SamplesApp/SamplesApp.UnitTests.Shared/Controls/UITests/Presentation/SampleChooserViewMode.Properties.cs
index 8e4c19be4937..ef875754bf13 100644
--- a/src/SamplesApp/SamplesApp.UnitTests.Shared/Controls/UITests/Presentation/SampleChooserViewMode.Properties.cs
+++ b/src/SamplesApp/SamplesApp.UnitTests.Shared/Controls/UITests/Presentation/SampleChooserViewMode.Properties.cs
@@ -46,6 +46,7 @@ public partial class SampleChooserViewModel : System.ComponentModel.INotifyPrope
 		private bool _contentAttachedToWindow;
 		private bool _useFluentStyles;
 		private bool _useDarkTheme;
+		private bool _manualTestsOnly;
 		private object _contentPhone = null;
 		private string _searchTerm = "";
 
@@ -134,6 +135,17 @@ public bool CategoryVisibility
 			}
 		}
 
+		public bool ManualTestsOnly
+		{
+			get => _manualTestsOnly;
+			set
+			{
+				_manualTestsOnly = value;
+				RaisePropertyChanged();
+				RefreshSamples();
+			}
+		}
+
 		public bool SampleVisibility
 		{
 			get => _sampleVisibility;
diff --git a/src/SamplesApp/SamplesApp.UnitTests.Shared/Controls/UITests/Presentation/SampleChooserViewModel.cs b/src/SamplesApp/SamplesApp.UnitTests.Shared/Controls/UITests/Presentation/SampleChooserViewModel.cs
index 023ad28d5d0f..131826e726c7 100644
--- a/src/SamplesApp/SamplesApp.UnitTests.Shared/Controls/UITests/Presentation/SampleChooserViewModel.cs
+++ b/src/SamplesApp/SamplesApp.UnitTests.Shared/Controls/UITests/Presentation/SampleChooserViewModel.cs
@@ -116,7 +116,7 @@ public SampleChooserViewModel(SampleChooserControl owner)
 			InitializeCommands();
 			ObserveChanges();
 
-			_categories = GetSamples();
+			RefreshSamples();
 
 			if (_log.IsEnabled(LogLevel.Information))
 			{
@@ -747,6 +747,11 @@ private static Assembly[] GetAllAssembies()
 #endif
 		}
 
+		private void RefreshSamples()
+		{
+			Categories = GetSamples();
+		}
+
 		/// <summary>
 		/// This method retreives all the categories and sample contents associated with them throughout the app.
 		/// </summary>
@@ -756,7 +761,7 @@ private List<SampleChooserCategory> GetSamples()
 			var categories =
 				from type in _allSamples
 				let sampleAttribute = FindSampleAttribute(type.GetTypeInfo())
-				where sampleAttribute != null
+				where sampleAttribute != null && (!_manualTestsOnly || sampleAttribute.IsManualTest)
 				let content = GetContent(type.GetTypeInfo(), sampleAttribute)
 				from category in content.Categories
 				group content by category into contentByCategory
diff --git a/src/SamplesApp/SamplesApp.UnitTests.Shared/Controls/UITests/Views/Controls/SampleChooserControl.xaml b/src/SamplesApp/SamplesApp.UnitTests.Shared/Controls/UITests/Views/Controls/SampleChooserControl.xaml
index ff9ca45ef91a..79121ee6fb5c 100644
--- a/src/SamplesApp/SamplesApp.UnitTests.Shared/Controls/UITests/Views/Controls/SampleChooserControl.xaml
+++ b/src/SamplesApp/SamplesApp.UnitTests.Shared/Controls/UITests/Views/Controls/SampleChooserControl.xaml
@@ -266,6 +266,7 @@
 
 				<!-- LIBRARY (Categories)-->
 				<Grid Style="{StaticResource BaseTitleGridContainerStyle}"
+					  Height="80"
 					  Visibility="{Binding CategoryVisibility, Converter={StaticResource TrueToVisible}}">
 
 					<Grid.ColumnDefinitions>
@@ -276,6 +277,11 @@
 						<ColumnDefinition Width="Auto" />
 					</Grid.ColumnDefinitions>
 
+					<Grid.RowDefinitions>
+						<RowDefinition Height="Auto" />
+						<RowDefinition Height="Auto" />
+					</Grid.RowDefinitions>
+
 					<!-- Runtime tests button -->
 					<Button Style="{StaticResource IconButtonStyle}"
 							VerticalAlignment="Center"
@@ -284,6 +290,8 @@
 						<u:PathControl Style="{StaticResource Icon_RuntimeTests}"
 									   Margin="5,0" />
 					</Button>
+					
+					<!-- Playground button -->
 					<Button Style="{StaticResource IconButtonStyle}"
 							Foreground="{StaticResource Color06Brush}"
 							Grid.Column="1"
@@ -320,6 +328,9 @@
 						<u:PathControl Style="{StaticResource Icon_RunAll}"
 									   Margin="5,0" />
 					</Button>
+
+					<CheckBox Grid.Row="1" Grid.ColumnSpan="5" HorizontalAlignment="Center" 
+							  IsChecked="{Binding ManualTestsOnly, Mode=TwoWay}" Content="Manual tests only" />
 				</Grid>
 				<ContentControl ContentTemplate="{StaticResource CategoriesList}"
 								Grid.Row="1"