diff --git a/src/library/Uno.Cupertino/Styles/Controls/ToggleSwitch.xaml b/src/library/Uno.Cupertino/Styles/Controls/ToggleSwitch.xaml
index 2112652df..9afc6c858 100644
--- a/src/library/Uno.Cupertino/Styles/Controls/ToggleSwitch.xaml
+++ b/src/library/Uno.Cupertino/Styles/Controls/ToggleSwitch.xaml
@@ -16,6 +16,8 @@
 					 Color="{ThemeResource CupertinoWhiteColor}" />
 	<SolidColorBrush x:Key="CupertinoToggleSwitchOnBackgroundBrush"
 					 Color="{ThemeResource CupertinoGreenColor}" />
+	
+	<x:Double x:Key="ToggleSwitchThemeMinWidth">0</x:Double>
 
 	<Style x:Key="DefaultCupertinoToggleSwitchStyle"
 		   TargetType="ToggleSwitch">
@@ -25,6 +27,8 @@
 				Value="{ThemeResource CupertinoToggleSwitchOnButtonBrush}" />
 		<Setter Property="Background"
 				Value="{ThemeResource CupertinoToggleSwitchOnBackgroundBrush}" />
+		<Setter Property="MinWidth"
+				Value="{ThemeResource ToggleSwitchThemeMinWidth}" />
 
 		<Setter Property="HorizontalAlignment"
 				Value="Left" />
diff --git a/src/library/Uno.Material/Styles/Controls/v2/ToggleSwitch.xaml b/src/library/Uno.Material/Styles/Controls/v2/ToggleSwitch.xaml
index 6f14011ae..5d30296cf 100644
--- a/src/library/Uno.Material/Styles/Controls/v2/ToggleSwitch.xaml
+++ b/src/library/Uno.Material/Styles/Controls/v2/ToggleSwitch.xaml
@@ -52,6 +52,7 @@
 			<x:Double x:Key="MediumThumbSize">24</x:Double>
 			<x:Double x:Key="LargeThumbSize">28</x:Double>
 			<x:Double x:Key="KnobIconSize">16</x:Double>
+			<x:Double x:Key="ToggleSwitchThemeMinWidth">0</x:Double>
 
 			<CornerRadius x:Key="LargeThumbCornerRadius">14</CornerRadius>
 
@@ -109,6 +110,7 @@
 			<x:Double x:Key="MediumThumbSize">24</x:Double>
 			<x:Double x:Key="LargeThumbSize">28</x:Double>
 			<x:Double x:Key="KnobIconSize">16</x:Double>
+			<x:Double x:Key="ToggleSwitchThemeMinWidth">0</x:Double>
 
 			<CornerRadius x:Key="LargeThumbCornerRadius">14</CornerRadius>
 
@@ -153,6 +155,8 @@
 		<Setter Property="OnContent" Value="{x:Null}" />
 		<Setter Property="OffContent" Value="{x:Null}" />
 
+		<Setter Property="MinWidth" Value="{ThemeResource ToggleSwitchThemeMinWidth}" />
+
 		<Setter Property="Template">
 			<Setter.Value>
 				<ControlTemplate TargetType="ToggleSwitch">