diff --git a/.changeset/rude-dragons-speak.md b/.changeset/rude-dragons-speak.md
new file mode 100644
index 0000000000..c26c9d9058
--- /dev/null
+++ b/.changeset/rude-dragons-speak.md
@@ -0,0 +1,6 @@
+---
+'@sap-ux-private/preview-middleware-client': patch
+'@sap-ux/preview-middleware': patch
+---
+
+Add stable ids in AddFragment and ControllerExtension forms
diff --git a/packages/preview-middleware-client/src/adp/ui/AddFragment.fragment.xml b/packages/preview-middleware-client/src/adp/ui/AddFragment.fragment.xml
index 2c8f137b54..868acae326 100644
--- a/packages/preview-middleware-client/src/adp/ui/AddFragment.fragment.xml
+++ b/packages/preview-middleware-client/src/adp/ui/AddFragment.fragment.xml
@@ -1,9 +1,11 @@
 <Dialog id="addNewFragmentDialog"
     xmlns="sap.m"
     xmlns:core="sap.ui.core"
+    xmlns:l="sap.ui.layout"
     xmlns:f="sap.ui.layout.form"  
     title="{/title}" 
     contentWidth="500px" 
+    initialFocus="aggregationName"
     class="sapUiRTABorder">
     <content>
         <f:SimpleForm id="addNewFragmentDialog_Form"
@@ -13,9 +15,14 @@
             singleContainerFullSize="false">
             <f:content>
                 <Label visible="{/completeView}"  text="{i18n>ADP_ADD_FRAGMENT_DIALOG_CONTROL_TYPE_LABEL}" />
-                <Text visible="{/completeView}" text="{/selectedControlName}" />
+                <Input
+                    id="controlType"
+                    visible="{/completeView}"
+                    value="{/selectedControlName}"
+                    editable="false" />
                 <Label visible="{/completeView}" text="{i18n>ADP_ADD_FRAGMENT_DIALOG_AGGREGATION_LABEL}" />
                 <Select
+                    id="aggregationName"
                     visible="{/completeView}"
                     change="onAggregationChanged"
                     selectedKey="{/selectedAggregation/key}"
@@ -26,8 +33,8 @@
                     <core:Item key="{key}" text="{value}" />
                 </Select>
                 <Label text="{i18n>ADP_ADD_FRAGMENT_DIALOG_INDEX_LABEL}" />
-                <HBox alignItems="Center">
                     <Select
+                        id="aggregationIndex"
                         enabled="{/indexHandlingFlag}"
                         selectedKey="{path: '/selectedIndex', type: 'sap.ui.model.type.Integer'}"
                         items="{
@@ -37,14 +44,20 @@
                         <core:Item key="{key}" text="{value}" />
                     </Select>
                     <core:Icon
+                        id="aggregationIndexInfoIcon"
                         useIconTooltip="false"
                         visible="{/specialIndexHandlingIcon}" 
                         src="sap-icon://message-information" 
-                        class= "sapUiTinyMarginBegin" 
-                        tooltip="{/iconTooltip}" />
-                </HBox>
-                <Label text="{i18n>ADP_ADD_FRAGMENT_DIALOG_FRAGMENT_NAME_LABEL}" />
+                        width="1rem"
+                        height="2rem"
+                        tooltip="{/iconTooltip}">
+                        <core:layoutData>
+                            <l:GridData span="S6" />
+                        </core:layoutData>
+                    </core:Icon>
+                <Label text="{i18n>ADP_ADD_FRAGMENT_DIALOG_FRAGMENT_NAME_LABEL}" required="true" />
                 <Input 
+                    id="fragmentName"
                     description=".fragment.xml" 
                     value="{/newFragmentName}" 
                     liveChange="onFragmentNameInputChange">
diff --git a/packages/preview-middleware-client/src/adp/ui/ControllerExtension.fragment.xml b/packages/preview-middleware-client/src/adp/ui/ControllerExtension.fragment.xml
index 8e76780011..e3a365533a 100644
--- a/packages/preview-middleware-client/src/adp/ui/ControllerExtension.fragment.xml
+++ b/packages/preview-middleware-client/src/adp/ui/ControllerExtension.fragment.xml
@@ -15,6 +15,7 @@
             <f:content>
                 <Label text="Controller Name" />
                 <Input 
+                    id="controllerName"
                     description=".js" 
                     value="{/newControllerName}" 
                     liveChange="onControllerNameInputChange">