diff --git a/pkg/interface/src/views/apps/chat/components/ChatMessage.tsx b/pkg/interface/src/views/apps/chat/components/ChatMessage.tsx
index c57d21143..c1ff5f630 100644
--- a/pkg/interface/src/views/apps/chat/components/ChatMessage.tsx
+++ b/pkg/interface/src/views/apps/chat/components/ChatMessage.tsx
@@ -282,7 +282,7 @@ export const MessageContent = ({ content, contacts, measure, fontSize, group })
           url={content.url}
           onLoad={measure}
           imageProps={{style: {
-            maxWidth: '18rem',
+            maxWidth: 'min(100%,18rem)',
             display: 'block'
           }}}
           videoProps={{style: {
diff --git a/pkg/interface/src/views/landscape/components/ResourceSkeleton.tsx b/pkg/interface/src/views/landscape/components/ResourceSkeleton.tsx
index 4e7fcd862..f2d8329ce 100644
--- a/pkg/interface/src/views/landscape/components/ResourceSkeleton.tsx
+++ b/pkg/interface/src/views/landscape/components/ResourceSkeleton.tsx
@@ -72,6 +72,7 @@ export function ResourceSkeleton(props: ResourceSkeletonProps) {
             mr={3}
             my="1"
             display={["block", "none"]}
+            flexShrink={0}
           >
             <Link to={`/~landscape${workspace}`}> {"<- Back"}</Link>
           </Box>
@@ -85,8 +86,8 @@ export function ResourceSkeleton(props: ResourceSkeletonProps) {
 
         {atRoot && (
           <>
-            <Box px={1} mr={2}>
-              <Text fontSize='2' fontWeight='700' display="inline-block" verticalAlign="middle" textOverflow="ellipsis" overflow="hidden" whiteSpace="pre">
+            <Box px={1} mr={2} minWidth={0} display="flex">
+              <Text fontSize='2' fontWeight='700' display="inline-block" verticalAlign="middle" textOverflow="ellipsis" overflow="hidden" whiteSpace="pre" minWidth={0}>
                 {title}
               </Text>
             </Box>