diff --git a/shell/components/nav/WindowManager/ContainerLogs.vue b/shell/components/nav/WindowManager/ContainerLogs.vue
index 4298f7fc6c..0d1aa3107c 100644
--- a/shell/components/nav/WindowManager/ContainerLogs.vue
+++ b/shell/components/nav/WindowManager/ContainerLogs.vue
@@ -463,7 +463,7 @@ export default {
             />
           </template>
         </Select>
-        <div class="log-action ml-5">
+        <div class="log-action log-action-group ml-5">
           <button
             class="btn bg-primary wm-btn"
             :disabled="isFollowing"
@@ -503,7 +503,7 @@ export default {
           </div>
         </div>
 
-        <div class="log-action ml-5">
+        <div class="log-action log-action-group ml-5">
           <v-popover
             trigger="click"
             placement="top"
@@ -543,7 +543,7 @@ export default {
           </v-popover>
         </div>
 
-        <div class="log-action ml-5">
+        <div class="log-action log-action-group ml-5">
           <input
             v-model="search"
             class="input-sm"
@@ -654,10 +654,23 @@ export default {
     }
   }
 
+  .log-action-group {
+    display: flex;
+    gap: 3px;
+
+    .input-sm {
+      min-width: 180px;
+    }
+  }
+
   .log-previous {
     align-items: center;
     display: flex;
+    min-width: 175px;
     height: 30px;
+    text-overflow : ellipsis;
+    overflow      : hidden;
+    white-space   : nowrap;
   }
 
   .status {
diff --git a/shell/components/nav/WindowManager/Window.vue b/shell/components/nav/WindowManager/Window.vue
index 8991329697..19a4b0379e 100644
--- a/shell/components/nav/WindowManager/Window.vue
+++ b/shell/components/nav/WindowManager/Window.vue
@@ -93,6 +93,8 @@ export default {
     vertical-align: middle;
     // line-height: $title-height - 4px;
     padding: 10px;
+    overflow-x: auto;
+    overflow-y: hidden;
   }
 
   .body {