diff --git a/src/components/KymaModules/KymaModulesList.js b/src/components/KymaModules/KymaModulesList.js
index 3e3c028bcd..3f7800fa4e 100644
--- a/src/components/KymaModules/KymaModulesList.js
+++ b/src/components/KymaModules/KymaModulesList.js
@@ -4,11 +4,11 @@ import jsyaml from 'js-yaml';
 
 import { ResourceDetails } from 'shared/components/ResourceDetails/ResourceDetails';
 import {
+  DynamicPageHeader,
   Button,
   FlexBox,
   Text,
   Tag,
-  DynamicPageHeader,
 } from '@ui5/webcomponents-react';
 
 import { HintButton } from 'shared/components/DescriptionHint/DescriptionHint';
@@ -421,7 +421,7 @@ export default function KymaModulesList({
       layoutNumber="StartColumn"
       windowTitle={t('kyma-modules.title')}
       headerContent={
-        <DynamicPageHeader>
+        <DynamicPageHeader className="no-shadow">
           <FlexBox alignItems="Center">
             <Label showColon>{t('kyma-modules.release-channel')}</Label>
             <Text renderWhitespace={true}> </Text>
diff --git a/src/shared/components/DynamicPageComponent/DynamicPageComponent.js b/src/shared/components/DynamicPageComponent/DynamicPageComponent.js
index cf410fffdd..995a11edb2 100644
--- a/src/shared/components/DynamicPageComponent/DynamicPageComponent.js
+++ b/src/shared/components/DynamicPageComponent/DynamicPageComponent.js
@@ -14,7 +14,7 @@ import { ToolbarSpacer } from '@ui5/webcomponents-react-compat/dist/components/T
 import { ToolbarSeparator } from '@ui5/webcomponents-react-compat/dist/components/ToolbarSeparator/index.js';
 
 import './DynamicPageComponent.scss';
-import { useEffect, useState } from 'react';
+import { useEffect, useState, useRef } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useRecoilState } from 'recoil';
 import { columnLayoutState } from 'state/columnLayoutAtom';
@@ -23,6 +23,62 @@ import { isResourceEditedState } from 'state/resourceEditedAtom';
 import { isFormOpenState } from 'state/formOpenAtom';
 import { handleActionIfFormOpen } from '../UnsavedMessageBox/helpers';
 
+const useGetHeaderHeight = (dynamicPageRef, tabContainerRef) => {
+  const [headerHeight, setHeaderHeight] = useState(undefined);
+  const [tabContainerHeight, setTabContainerHeight] = useState(undefined);
+
+  useEffect(() => {
+    const headerObserver = new ResizeObserver(([header]) => {
+      setHeaderHeight(header.contentRect.height);
+    });
+
+    const tabContainerObserver = new ResizeObserver(([tabContainer]) => {
+      setTabContainerHeight(tabContainer.contentRect.height);
+    });
+
+    if (dynamicPageRef.current) {
+      // Wait for the custom element to be defined
+      void customElements.whenDefined('ui5-dynamic-page').then(() => {
+        const shadowRoot = dynamicPageRef.current?.shadowRoot;
+
+        if (!shadowRoot) {
+          return;
+        }
+
+        // Wait for the shadowRoot to be populated
+        const shadowRootObserver = new MutationObserver(() => {
+          const header = shadowRoot.querySelector('header');
+
+          if (header) {
+            headerObserver.observe(header);
+            shadowRootObserver.disconnect();
+          }
+        });
+
+        if (shadowRoot.childElementCount > 0) {
+          const header = shadowRoot.querySelector('header');
+          if (header) {
+            headerObserver.observe(header);
+          }
+        } else if (shadowRoot instanceof Node) {
+          shadowRootObserver.observe(shadowRoot, { childList: true });
+        }
+      });
+    }
+
+    if (tabContainerRef.current) {
+      tabContainerObserver.observe(tabContainerRef.current);
+    }
+
+    return () => {
+      headerObserver.disconnect();
+      tabContainerObserver.disconnect();
+    };
+  }, [dynamicPageRef, tabContainerRef]);
+
+  return { headerHeight, tabContainerHeight };
+};
+
 const Column = ({ title, children, columnSpan, image, style = {} }) => {
   const styleComputed = { gridColumn: columnSpan, ...style };
   return (
@@ -62,25 +118,12 @@ export const DynamicPageComponent = ({
   const [isFormOpen, setIsFormOpen] = useRecoilState(isFormOpenState);
   const [selectedSectionIdState, setSelectedSectionIdState] = useState('view');
 
-  const [stickyHeaderHeight, setStickyHeaderHeight] = useState(0);
-
-  useEffect(() => {
-    const pageCompClassName = `.page-header${className ? `.${className}` : ''}`;
-    setTimeout(() => {
-      setStickyHeaderHeight(
-        (document.querySelector(pageCompClassName)?.querySelector('header')
-          ?.clientHeight ?? 0) +
-          (document
-            .querySelector(pageCompClassName)
-            ?.querySelector('[data-component-name="ObjectPageTabContainer"]')
-            ?.clientHeight ?? 0) +
-          (document
-            .querySelector(pageCompClassName)
-            ?.querySelector('[data-component-name="DynamicPageHeader"]')
-            ?.clientHeight ?? 0),
-      );
-    });
-  }, []); // eslint-disable-line react-hooks/exhaustive-deps
+  const dynamicPageRef = useRef(null);
+  const tabContainerRef = useRef(null);
+  const { headerHeight, tabContainerHeight } = useGetHeaderHeight(
+    dynamicPageRef,
+    tabContainerRef,
+  );
 
   const handleColumnClose = () => {
     window.history.pushState(
@@ -291,8 +334,27 @@ export const DynamicPageComponent = ({
             setIsFormOpen({ formOpen: true });
           }
         }}
+        ref={dynamicPage => {
+          if (dynamicPageRef) {
+            if (typeof dynamicPageRef === 'function') {
+              dynamicPageRef(dynamicPage);
+            } else if (dynamicPageRef.current !== undefined) {
+              dynamicPageRef.current = dynamicPage;
+            }
+          }
+
+          const button = dynamicPage?.shadowRoot?.querySelector(
+            'ui5-dynamic-page-header-actions',
+          );
+          if (button) {
+            button.style['display'] = 'none';
+          }
+        }}
       >
         <TabContainer
+          className="tab-container"
+          style={{ top: `${headerHeight}px` }}
+          ref={tabContainerRef}
           onTabSelect={event => {
             const mode = event.detail.tab.getAttribute('data-mode');
             setSelectedSectionIdState(mode);
@@ -308,7 +370,7 @@ export const DynamicPageComponent = ({
         {selectedSectionIdState === 'view' && content}
 
         {selectedSectionIdState === 'edit' &&
-          inlineEditForm(stickyHeaderHeight)}
+          inlineEditForm(headerHeight + tabContainerHeight)}
       </DynamicPage>
     );
   }
@@ -320,8 +382,9 @@ export const DynamicPageComponent = ({
       titleArea={headerTitle}
       headerArea={headerContent}
       footerArea={footer}
+      ref={dynamicPageRef}
     >
-      {typeof content === 'function' ? content(stickyHeaderHeight) : content}
+      {typeof content === 'function' ? content(headerHeight) : content}
     </DynamicPage>
   );
 };
diff --git a/src/shared/components/DynamicPageComponent/DynamicPageComponent.scss b/src/shared/components/DynamicPageComponent/DynamicPageComponent.scss
index 7f3b00be43..a1122a9d0b 100644
--- a/src/shared/components/DynamicPageComponent/DynamicPageComponent.scss
+++ b/src/shared/components/DynamicPageComponent/DynamicPageComponent.scss
@@ -1,10 +1,6 @@
 .page-header {
   background-color: var(--sapBackgroundColor);
 
-  .no-shadow {
-    box-shadow: none;
-  }
-
   ui5-dynamic-page-title {
     justify-content: center;
     min-height: 3rem;
@@ -58,6 +54,17 @@
     position: static;
     padding: unset;
   }
+
+  .tab-container {
+    position: sticky;
+    z-index: 1;
+  }
+}
+
+ui5-dynamic-page {
+  .no-shadow {
+    box-shadow: none;
+  }
 }
 
 .header-wrapper {