diff --git a/src/shared/components/ResourceCreate/ResourceCreate.js b/src/shared/components/ResourceCreate/ResourceCreate.js
index 2893424ba3..05aa297548 100644
--- a/src/shared/components/ResourceCreate/ResourceCreate.js
+++ b/src/shared/components/ResourceCreate/ResourceCreate.js
@@ -177,20 +177,27 @@ export const ResourceCreate = ({
           }`}
           showYamlTab={disableEdit && onlyYaml}
           content={stickyHeaderHeight => (
-            <div className="create-form">
-              {renderForm({
-                formElementRef,
-                isValid,
-                setCustomValid,
-                onChange: handleFormChanged,
-                onError: handleFormError,
-                onCompleted: handleFormSuccess,
-                performManualSubmit: handleFormSubmit,
-                stickyHeaderHeight,
-              })}
+            <>
               <div
+                className="create-form"
+                style={spacing.sapUiSmallMarginBottom}
+              >
+                {renderForm({
+                  formElementRef,
+                  isValid,
+                  setCustomValid,
+                  onChange: handleFormChanged,
+                  onError: handleFormError,
+                  onCompleted: handleFormSuccess,
+                  performManualSubmit: handleFormSubmit,
+                  stickyHeaderHeight,
+                })}
+              </div>
+              <div
+                data-testid={'create-form-footer-bar'}
                 style={{
                   ...spacing.sapUiSmallMarginBeginEnd,
+                  marginTop: 'auto',
                   position: 'sticky',
                   bottom: '0.5rem',
                 }}
@@ -205,7 +212,7 @@ export const ResourceCreate = ({
                   }
                 />
               </div>
-            </div>
+            </>
           )}
         />
       )}
diff --git a/tests/integration/support/create-edit-support.js b/tests/integration/support/create-edit-support.js
index 9a10f827b9..bc6acca209 100644
--- a/tests/integration/support/create-edit-support.js
+++ b/tests/integration/support/create-edit-support.js
@@ -6,7 +6,7 @@ Cypress.Commands.add('openCreate', () => {
 
 Cypress.Commands.add('saveChanges', (action = 'Create') => {
   const isCreate = action === 'Create';
-  cy.get(isCreate ? '.create-form' : '.edit-form')
+  cy.get(isCreate ? '[data-testid="create-form-footer-bar"]' : '.edit-form')
     .contains('ui5-button:visible', isCreate ? 'Create' : 'Save')
     .click();
 });