diff --git a/workspaces/homepage/.changeset/brave-rocks-wave.md b/workspaces/homepage/.changeset/brave-rocks-wave.md
new file mode 100644
index 0000000000..990412c2eb
--- /dev/null
+++ b/workspaces/homepage/.changeset/brave-rocks-wave.md
@@ -0,0 +1,5 @@
+---
+'@red-hat-developer-hub/backstage-plugin-dynamic-home-page': patch
+---
+
+Fixed Homepage Layout when quickstart is visible
diff --git a/workspaces/homepage/plugins/dynamic-home-page/src/components/EntitySection/EntityCard.tsx b/workspaces/homepage/plugins/dynamic-home-page/src/components/EntitySection/EntityCard.tsx
index 4c5d045b1e..249da2e081 100644
--- a/workspaces/homepage/plugins/dynamic-home-page/src/components/EntitySection/EntityCard.tsx
+++ b/workspaces/homepage/plugins/dynamic-home-page/src/components/EntitySection/EntityCard.tsx
@@ -48,7 +48,8 @@ const EntityCard: FC<EntityCardProps> = ({
       sx={{
         border: theme => `1px solid ${theme.palette.grey[400]}`,
         overflow: 'auto',
-        maxHeight: '100%',
+        height: '100%',
+        width: '100%',
       }}
     >
       <CardContent
@@ -58,6 +59,9 @@ const EntityCard: FC<EntityCardProps> = ({
             pb: 2,
           },
           backgroundColor: 'transparent',
+          display: 'flex',
+          flexDirection: 'column',
+          justifyContent: 'space-between',
         }}
       >
         <Box sx={{ overflow: 'hidden' }}>
diff --git a/workspaces/homepage/plugins/dynamic-home-page/src/components/EntitySection/EntitySection.test.tsx b/workspaces/homepage/plugins/dynamic-home-page/src/components/EntitySection/EntitySection.test.tsx
index 73094f2996..ae8783544e 100644
--- a/workspaces/homepage/plugins/dynamic-home-page/src/components/EntitySection/EntitySection.test.tsx
+++ b/workspaces/homepage/plugins/dynamic-home-page/src/components/EntitySection/EntitySection.test.tsx
@@ -72,6 +72,14 @@ jest.mock('../../utils/utils', () => ({
 
 jest.mock('../../images/homepage-entities-1.svg', () => 'mock-image.svg');
 
+// ResizeObserver is not available in JSDOM
+class ResizeObserverMock {
+  observe = jest.fn();
+  unobserve = jest.fn();
+  disconnect = jest.fn();
+}
+window.ResizeObserver = ResizeObserverMock as unknown as typeof ResizeObserver;
+
 const theme = createTheme();
 
 const renderComponent = () =>
diff --git a/workspaces/homepage/plugins/dynamic-home-page/src/components/EntitySection/EntitySection.tsx b/workspaces/homepage/plugins/dynamic-home-page/src/components/EntitySection/EntitySection.tsx
index c425b3ab50..ad13bb392f 100644
--- a/workspaces/homepage/plugins/dynamic-home-page/src/components/EntitySection/EntitySection.tsx
+++ b/workspaces/homepage/plugins/dynamic-home-page/src/components/EntitySection/EntitySection.tsx
@@ -15,7 +15,7 @@
  */
 import type { ReactNode } from 'react';
 
-import { useState, useEffect, Fragment } from 'react';
+import { useState, useEffect, Fragment, useRef } from 'react';
 
 import {
   CodeSnippet,
@@ -67,6 +67,22 @@ export const EntitySection = () => {
 
   const isMd = useMediaQuery(theme.breakpoints.only('md'));
 
+  const [contentWidth, setContentWidth] = useState(0);
+  const resizeObserverRef = useRef<ResizeObserver | null>(null);
+
+  const setContentNode = (node: HTMLDivElement | null) => {
+    if (!node) return;
+
+    resizeObserverRef.current?.disconnect();
+
+    resizeObserverRef.current = new ResizeObserver(entries => {
+      const width = entries[0].contentRect.width;
+      setContentWidth(width);
+    });
+
+    resizeObserverRef.current.observe(node);
+  };
+
   useEffect(() => {
     if (isMd) {
       setIsMediumBreakpoint(true);
@@ -126,17 +142,24 @@ export const EntitySection = () => {
     content = (
       <Box sx={{ padding: '8px 8px 8px 0' }}>
         <Fragment>
-          <Grid container spacing={1} alignItems="stretch">
+          <Grid
+            container
+            sx={{
+              display: 'flex',
+            }}
+            spacing={1}
+            alignItems="stretch"
+          >
             {!isRemoveFirstCard && !profileLoading && (
-              <Grid item xs={12} md={6} lg={5} key="entities illustration">
+              <Grid item xs={12} md={6} lg={4} key="entities illustration">
                 <Card
                   elevation={0}
                   sx={{
                     border: `1px solid ${theme.palette.grey[400]}`,
                     display: 'flex',
-                    flexDirection: 'row',
-                    alignItems: 'center',
                     position: 'relative',
+                    width: '100%',
+                    height: '100%',
                     transition:
                       'opacity 0.5s ease-out, transform 0.5s ease-in-out',
                     opacity: showDiscoveryCard ? 1 : 0,
@@ -145,45 +168,58 @@ export const EntitySection = () => {
                       : 'translateX(-50px)',
                   }}
                 >
-                  {!imgLoaded && (
-                    <Skeleton
-                      variant="rectangular"
+                  <Box
+                    ref={setContentNode}
+                    sx={{
+                      display: 'flex',
+                      justifyContent: 'center',
+                      alignItems: 'center',
+                      flexDirection: contentWidth > 350 ? 'row' : 'column',
+                      width: '100%',
+                      maxWidth: '550px',
+                      minHeight: '100%',
+                    }}
+                  >
+                    {!imgLoaded && (
+                      <Skeleton
+                        variant="rectangular"
+                        height={300}
+                        sx={{
+                          borderRadius: 3,
+                          width: 'clamp(140px, 14vw, 266px)',
+                        }}
+                      />
+                    )}
+                    <Box
+                      component="img"
+                      src={HomePageEntityIllustration}
+                      onLoad={() => setImgLoaded(true)}
+                      alt=""
                       height={300}
                       sx={{
-                        borderRadius: 3,
                         width: 'clamp(140px, 14vw, 266px)',
                       }}
                     />
-                  )}
-                  <Box
-                    component="img"
-                    src={HomePageEntityIllustration}
-                    onLoad={() => setImgLoaded(true)}
-                    alt=""
-                    height={300}
-                    sx={{
-                      width: 'clamp(140px, 14vw, 266px)',
-                    }}
-                  />
-                  <Box sx={{ p: 2 }}>
-                    <Box>
-                      <Typography variant="body2" paragraph>
-                        {t('entities.description')}
-                      </Typography>
+                    <Box sx={{ p: 2, display: 'flex' }}>
+                      <Box sx={{ display: 'flex', minWidth: 0 }}>
+                        <Typography variant="body2" component="div">
+                          {t('entities.description')}
+                        </Typography>
+                      </Box>
+                      {entities?.length > 0 && (
+                        <IconButton
+                          onClick={handleClose}
+                          aria-label={t('entities.close')}
+                          sx={{
+                            position: 'absolute',
+                            top: '8px',
+                            right: '8px',
+                          }}
+                        >
+                          <CloseIcon sx={{ width: '16px', height: '16px' }} />
+                        </IconButton>
+                      )}
                     </Box>
-                    {entities?.length > 0 && (
-                      <IconButton
-                        onClick={handleClose}
-                        aria-label={t('entities.close')}
-                        style={{
-                          position: 'absolute',
-                          top: '8px',
-                          right: '8px',
-                        }}
-                      >
-                        <CloseIcon style={{ width: '16px', height: '16px' }} />
-                      </IconButton>
-                    )}
                   </Box>
                 </Card>
               </Grid>
@@ -195,8 +231,9 @@ export const EntitySection = () => {
                   item
                   xs={12}
                   md={6}
-                  lg={isRemoveFirstCard ? 3 : 3.5}
+                  lg={isRemoveFirstCard ? 3 : 4}
                   key={item.metadata.name}
+                  display="flex"
                 >
                   <EntityCard
                     entity={item}
@@ -209,20 +246,33 @@ export const EntitySection = () => {
                 </Grid>
               ))}
             {entities?.length === 0 && (
-              <Grid item md={isRemoveFirstCard ? 12 : 7}>
+              <Grid
+                item
+                xs={12}
+                md={6}
+                lg={isRemoveFirstCard ? 3 : 4}
+                display="flex"
+              >
                 <Box
                   sx={{
                     display: 'flex',
-                    alignItems: 'center',
-                    justifyContent: 'center',
+                    flexDirection: 'column',
                     minHeight: 300,
+                    height: '100%',
+                    width: '100%',
                     border: muiTheme =>
                       `1px solid ${muiTheme.palette.grey[400]}`,
                     borderRadius: 3,
                     overflow: 'hidden',
                   }}
                 >
-                  <CardContent>
+                  <CardContent
+                    sx={{
+                      display: 'flex',
+                      flexDirection: 'column',
+                      flex: 1,
+                    }}
+                  >
                     <Typography sx={{ fontSize: '1.125rem', fontWeight: 500 }}>
                       {t('entities.empty')}
                     </Typography>
@@ -236,9 +286,11 @@ export const EntitySection = () => {
                     >
                       {t('entities.emptyDescription')}
                     </Typography>
-                    <StyledLink to="/catalog-import" underline="none">
-                      {t('entities.register')}
-                    </StyledLink>
+                    <Box sx={{ mt: 'auto', pt: 2 }}>
+                      <StyledLink to="/catalog-import" underline="none">
+                        {t('entities.register')}
+                      </StyledLink>
+                    </Box>
                   </CardContent>
                 </Box>
               </Grid>
@@ -256,6 +308,10 @@ export const EntitySection = () => {
         padding: '24px',
         border: muitheme => `1px solid ${muitheme.palette.grey[300]}`,
         overflow: 'auto',
+        flex: 1,
+        minHeight: 0,
+        display: 'flex',
+        flexDirection: 'column',
       }}
     >
       <Typography
@@ -265,21 +321,24 @@ export const EntitySection = () => {
           alignItems: 'center',
           fontWeight: '500',
           fontSize: '1.5rem',
+          flexShrink: 0,
         }}
       >
         {t('entities.title')}
       </Typography>
-      {content}
-      {entities?.length > 0 && (
-        <Box sx={{ pt: 2 }}>
-          <ViewMoreLink to="/catalog">
-            <Trans
-              message="entities.viewAll"
-              params={{ count: data?.totalItems?.toString() || '' }}
-            />
-          </ViewMoreLink>
-        </Box>
-      )}
+      <Box sx={{ flex: 1, minHeight: 0, overflow: 'auto' }}>
+        {content}
+        {entities?.length > 0 && (
+          <Box sx={{ pt: 2 }}>
+            <ViewMoreLink to="/catalog">
+              <Trans
+                message="entities.viewAll"
+                params={{ count: data?.totalItems?.toString() || '' }}
+              />
+            </ViewMoreLink>
+          </Box>
+        )}
+      </Box>
     </Card>
   );
 };
diff --git a/workspaces/homepage/plugins/dynamic-home-page/src/components/OnboardingSection/OnboardingCard.tsx b/workspaces/homepage/plugins/dynamic-home-page/src/components/OnboardingSection/OnboardingCard.tsx
index 57c3b7a4d4..0c065c9730 100644
--- a/workspaces/homepage/plugins/dynamic-home-page/src/components/OnboardingSection/OnboardingCard.tsx
+++ b/workspaces/homepage/plugins/dynamic-home-page/src/components/OnboardingSection/OnboardingCard.tsx
@@ -44,8 +44,8 @@ const OnboardingCard: FC<OnboardingCardProps> = ({
     <Box>
       <CardContent sx={{ backgroundColor: 'transparent' }}>
         <Typography
+          variant="h3"
           sx={{
-            fontSize: '1.75rem',
             fontWeight: 500,
             m: 0,
           }}
diff --git a/workspaces/homepage/plugins/dynamic-home-page/src/components/OnboardingSection/OnboardingSection.tsx b/workspaces/homepage/plugins/dynamic-home-page/src/components/OnboardingSection/OnboardingSection.tsx
index 9a5c264e80..0d9358a4b9 100644
--- a/workspaces/homepage/plugins/dynamic-home-page/src/components/OnboardingSection/OnboardingSection.tsx
+++ b/workspaces/homepage/plugins/dynamic-home-page/src/components/OnboardingSection/OnboardingSection.tsx
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { useState, useEffect } from 'react';
+import { useState, useEffect, type ComponentProps } from 'react';
 
 import { useUserProfile } from '@backstage/plugin-user-settings';
 import { useApi } from '@backstage/core-plugin-api';
@@ -81,15 +81,26 @@ export const OnboardingSection = () => {
 
   const content = (
     <Box>
-      <Grid container margin="auto">
+      <Grid
+        container
+        margin="auto"
+        sx={{
+          display: 'flex',
+          justifyContent: 'left',
+          alignItems: 'center',
+          overflow: 'auto',
+        }}
+        spacing={1}
+      >
         <Grid
-          item
-          xs={12}
-          md={6}
-          lg={3}
-          display="flex"
-          justifyContent="left"
-          alignItems="center"
+          {...({
+            size: { xs: 12, md: 6, lg: 3 },
+          } as ComponentProps<typeof Grid>)}
+          sx={{
+            display: 'flex',
+            justifyContent: 'center',
+            alignItems: 'center',
+          }}
         >
           <Box
             component="img"
@@ -104,14 +115,15 @@ export const OnboardingSection = () => {
         </Grid>
         {getLearningItems(t).map((item: LearningSectionItem) => (
           <Grid
-            item
-            xs={12}
-            md={6}
-            lg={3}
+            {...({
+              size: { xs: 12, md: 6, lg: 3 },
+            } as ComponentProps<typeof Grid>)}
+            sx={{
+              display: 'flex',
+              justifyContent: 'left',
+              alignItems: 'center',
+            }}
             key={item.title}
-            display="flex"
-            justifyContent="left"
-            alignItems="center"
           >
             <OnboardingCard
               title={item.title}
@@ -135,6 +147,8 @@ export const OnboardingSection = () => {
         padding: '24px',
         border: muiTheme => `1px solid ${muiTheme.palette.grey[300]}`,
         overflow: 'auto',
+        flex: 1,
+        minHeight: 0,
       }}
     >
       {!profileLoading && (
@@ -145,12 +159,13 @@ export const OnboardingSection = () => {
             alignItems: 'center',
             fontWeight: '500',
             fontSize: '1.5rem',
+            flexShrink: 0,
           }}
         >
           {`${greeting}, ${profileDisplayName() || t('onboarding.guest')}!`}
         </Typography>
       )}
-      {content}
+      <Box sx={{ flex: 1, minHeight: 0, overflow: 'auto' }}>{content}</Box>
     </Card>
   );
 };
diff --git a/workspaces/homepage/plugins/dynamic-home-page/src/components/ReadOnlyGrid.tsx b/workspaces/homepage/plugins/dynamic-home-page/src/components/ReadOnlyGrid.tsx
index af30714e9c..ca4793ce76 100644
--- a/workspaces/homepage/plugins/dynamic-home-page/src/components/ReadOnlyGrid.tsx
+++ b/workspaces/homepage/plugins/dynamic-home-page/src/components/ReadOnlyGrid.tsx
@@ -84,9 +84,18 @@ const defaultProps: ResponsiveProps = {
 const useStyles = makeStyles()({
   // Make card content scrollable (so that cards don't overlap)
   cardWrapper: {
+    height: '100%',
+    minHeight: 0,
+    overflow: 'hidden',
+    display: 'flex',
+    flexDirection: 'column',
     '& > div[class*="MuiCard-root"]': {
       width: '100%',
       height: '100%',
+      minHeight: 0,
+      display: 'flex',
+      flexDirection: 'column',
+      overflow: 'hidden',
     },
     '& div[class*="MuiCardContent-root"]': {
       overflow: 'auto',
diff --git a/workspaces/homepage/plugins/dynamic-home-page/src/components/TemplateSection/TemplateSection.tsx b/workspaces/homepage/plugins/dynamic-home-page/src/components/TemplateSection/TemplateSection.tsx
index aae0b7cfc8..6e0176e938 100644
--- a/workspaces/homepage/plugins/dynamic-home-page/src/components/TemplateSection/TemplateSection.tsx
+++ b/workspaces/homepage/plugins/dynamic-home-page/src/components/TemplateSection/TemplateSection.tsx
@@ -107,6 +107,7 @@ export const TemplateSection = () => {
                     display: 'flex',
                     alignItems: 'center',
                     justifyContent: 'center',
+                    maxWidth: 550,
                     border: muiTheme =>
                       `1px solid ${muiTheme.palette.grey[400]}`,
                     borderRadius: 3,