diff --git a/AppImage/components/system-logs.tsx b/AppImage/components/system-logs.tsx
index 098c952..3ee4b8c 100644
--- a/AppImage/components/system-logs.tsx
+++ b/AppImage/components/system-logs.tsx
@@ -848,12 +848,12 @@ export function SystemLogs() {
                 </Button>
               </div>
 
-              <ScrollArea className="h-[600px] w-full rounded-md border border-border">
-                <div className="space-y-2 p-4">
+              <ScrollArea className="h-[600px] w-full rounded-md border border-border overflow-x-hidden">
+                <div className="space-y-2 p-4 max-w-full">
                   {displayedLogs.map((log, index) => (
                     <div
                       key={index}
-                      className="flex flex-col md:flex-row md:items-start space-y-2 md:space-y-0 md:space-x-4 p-3 rounded-lg bg-muted/30 border border-border/50 hover:bg-muted/50 transition-colors cursor-pointer"
+                      className="flex flex-col md:flex-row md:items-start space-y-2 md:space-y-0 md:space-x-4 p-3 rounded-lg bg-muted/30 border border-border/50 hover:bg-muted/50 transition-colors cursor-pointer max-w-full overflow-hidden"
                       onClick={() => {
                         if (log.isEvent) {
                           setSelectedEvent(log.eventData)
@@ -877,15 +877,19 @@ export function SystemLogs() {
                         )}
                       </div>
 
-                      <div className="flex-1 min-w-0">
-                        <div className="flex items-center justify-between mb-1">
-                          <div className="text-sm font-medium text-foreground truncate">{log.service}</div>
-                          <div className="text-xs text-muted-foreground font-mono whitespace-nowrap ml-2">
+                      <div className="flex-1 min-w-0 max-w-full overflow-hidden">
+                        <div className="flex items-center justify-between mb-1 gap-2">
+                          <div className="text-sm font-medium text-foreground truncate flex-1 min-w-0">
+                            {log.service}
+                          </div>
+                          <div className="text-xs text-muted-foreground font-mono whitespace-nowrap flex-shrink-0">
                             {log.timestamp}
                           </div>
                         </div>
-                        <div className="text-sm text-foreground mb-1 line-clamp-2">{log.message}</div>
-                        <div className="text-xs text-muted-foreground truncate">
+                        <div className="text-sm text-foreground mb-1 line-clamp-2 break-all overflow-hidden">
+                          {log.message}
+                        </div>
+                        <div className="text-xs text-muted-foreground truncate break-all">
                           {log.source}
                           {log.pid && ` • PID: ${log.pid}`}
                           {log.hostname && ` • Host: ${log.hostname}`}