diff --git a/packages/pluggableWidgets/switch-native/CHANGELOG.md b/packages/pluggableWidgets/switch-native/CHANGELOG.md
index c47547966..decc000fd 100644
--- a/packages/pluggableWidgets/switch-native/CHANGELOG.md
+++ b/packages/pluggableWidgets/switch-native/CHANGELOG.md
@@ -6,6 +6,15 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ## [Unreleased]
 
+### Added
+
+-   Added the ability to change the position of the label in horizontal view from the left side of the switch to the right side.
+
+### Fixed
+
+-   We fixed an issue where the validation message was rendered inside the view container of the switch, which caused incorrect styling of the switch.
+-   Fixed an issue where
+
 ## [1.1.0] - 2024-12-3
 
 ### Changed
diff --git a/packages/pluggableWidgets/switch-native/src/Switch.editorConfig.ts b/packages/pluggableWidgets/switch-native/src/Switch.editorConfig.ts
index 0b6c14bc2..22fdae060 100644
--- a/packages/pluggableWidgets/switch-native/src/Switch.editorConfig.ts
+++ b/packages/pluggableWidgets/switch-native/src/Switch.editorConfig.ts
@@ -24,12 +24,11 @@ export function getPreview(values: SwitchPreviewProps, isDarkMode: boolean): Str
         document: decodeURIComponent(
             (isDarkMode ? StructurePreviewSwitchDarkSVG : StructurePreviewSwitchSVG).replace("data:image/svg+xml,", "")
         ),
-        width: 80,
+        width: 51,
         height: 30,
         grow: 8
     };
-    const children = values.showLabel ? [label, image] : [image];
-
+    const children = values.showLabel ? (values.labelPosition === "right" ? [image, label] : [label, image]) : [image];
     return values.labelOrientation === "horizontal"
         ? {
               type: "RowLayout",
@@ -48,7 +47,11 @@ export function getPreview(values: SwitchPreviewProps, isDarkMode: boolean): Str
 
 export function getProperties(values: SwitchPreviewProps, defaultProperties: Properties): Properties {
     if (!values.showLabel) {
-        hidePropertiesIn(defaultProperties, values, ["label", "labelOrientation"]);
+        hidePropertiesIn(defaultProperties, values, ["label", "labelOrientation", "labelPosition"]);
+    }
+
+    if (values.showLabel && values.labelOrientation !== "horizontal") {
+        hidePropertiesIn(defaultProperties, values, ["labelPosition"]);
     }
 
     return defaultProperties;