diff --git a/Apps/Examples/Examples/FioriSwiftUICore/FormViews/KeyValueFormViewExample.swift b/Apps/Examples/Examples/FioriSwiftUICore/FormViews/KeyValueFormViewExample.swift
index 0af182638..d6f5399f9 100755
--- a/Apps/Examples/Examples/FioriSwiftUICore/FormViews/KeyValueFormViewExample.swift
+++ b/Apps/Examples/Examples/FioriSwiftUICore/FormViews/KeyValueFormViewExample.swift
@@ -88,7 +88,9 @@ struct KeyValueFormViewExample: View {
                 Text("Read-Only")
                 KeyValueFormView(title: "Read-Only", text: self.$readOnlyText, placeholder: "Read-Only", controlState: .readOnly, minTextEditorHeight: 50, maxTextLength: 200, hidesReadOnlyHint: self.hidesReadonlyHint, isRequired: self.isRequired)
             }
+            #if !os(visionOS)
             .scrollDismissesKeyboard(.immediately)
+            #endif
         }
     }
 
diff --git a/Apps/Examples/Examples/FioriSwiftUICore/FormViews/NoteFormViewExample.swift b/Apps/Examples/Examples/FioriSwiftUICore/FormViews/NoteFormViewExample.swift
index aa974e82b..582e399d2 100755
--- a/Apps/Examples/Examples/FioriSwiftUICore/FormViews/NoteFormViewExample.swift
+++ b/Apps/Examples/Examples/FioriSwiftUICore/FormViews/NoteFormViewExample.swift
@@ -66,7 +66,9 @@ struct NoteFormViewExample: View {
                 Text("Read-Only")
                 NoteFormView(text: self.$readOnlyText, placeholder: "Read-Only", controlState: .readOnly, minTextEditorHeight: 50, maxTextEditorHeight: 200, hidesReadOnlyHint: self.hidesReadonlyHint)
             }
+            #if !os(visionOS)
             .scrollDismissesKeyboard(.immediately)
+            #endif
         }
     }
 
diff --git a/Apps/Examples/Examples/FioriSwiftUICore/FormViews/TextFieldFormViewExample.swift b/Apps/Examples/Examples/FioriSwiftUICore/FormViews/TextFieldFormViewExample.swift
index 88b496ab2..ea75fca2f 100644
--- a/Apps/Examples/Examples/FioriSwiftUICore/FormViews/TextFieldFormViewExample.swift
+++ b/Apps/Examples/Examples/FioriSwiftUICore/FormViews/TextFieldFormViewExample.swift
@@ -87,7 +87,9 @@ struct TextFieldFormViewExample: View {
                 Text("Read-Only")
                 TextFieldFormView(title: "Read-Only Cell", text: self.$readOnlyText, placeholder: "Read-Only", controlState: .readOnly, hidesReadOnlyHint: self.hidesReadonlyHint, isRequired: self.isRequired, actionIcon: self.getActionIcon(), action: self.getAction())
             }
+            #if !os(visionOS)
             .scrollDismissesKeyboard(.immediately)
+            #endif
         }
     }
 
diff --git a/Apps/Examples/Examples/FioriSwiftUICore/FormViews/TitleFormViewExample.swift b/Apps/Examples/Examples/FioriSwiftUICore/FormViews/TitleFormViewExample.swift
index cdda20f2b..9924077d4 100644
--- a/Apps/Examples/Examples/FioriSwiftUICore/FormViews/TitleFormViewExample.swift
+++ b/Apps/Examples/Examples/FioriSwiftUICore/FormViews/TitleFormViewExample.swift
@@ -61,7 +61,9 @@ struct TitleFormViewExample: View {
                 Text("Read-Only")
                 TitleFormView(text: self.$readOnlyText, placeholder: "Read-Only", controlState: .readOnly, hidesReadOnlyHint: self.hidesReadonlyHint)
             }
+            #if !os(visionOS)
             .scrollDismissesKeyboard(.immediately)
+            #endif
         }
     }
     
diff --git a/Sources/FioriSwiftUICore/_FioriStyles/StepperViewStyle.fiori.swift b/Sources/FioriSwiftUICore/_FioriStyles/StepperViewStyle.fiori.swift
index 834a6657f..9bf35b1fe 100644
--- a/Sources/FioriSwiftUICore/_FioriStyles/StepperViewStyle.fiori.swift
+++ b/Sources/FioriSwiftUICore/_FioriStyles/StepperViewStyle.fiori.swift
@@ -59,7 +59,7 @@ extension StepperViewFioriStyle {
         
         // Compact, regular, and full-width regular containers have leading and trailing padding of 16pt, 24pt, and 48pt, respectively. Fiori defines containers exceeding 768pt in width as full-width regular.
         func getPadding() -> CGFloat {
-            let padding: CGFloat = self.horizontalSizeClass == .compact ? 16 : (self.horizontalSizeClass == .regular ? (UIScreen.main.bounds.width > 768 ? 48 : 24) : 16)
+            let padding: CGFloat = self.horizontalSizeClass == .compact ? 16 : (self.horizontalSizeClass == .regular ? (Screen.bounds.width > 768 ? 48 : 24) : 16)
             return padding
         }
     }