diff --git a/src/components/terminal/LocalTerminalView.vue b/src/components/terminal/LocalTerminalView.vue
index 3d8d0c6..5a9e867 100644
--- a/src/components/terminal/LocalTerminalView.vue
+++ b/src/components/terminal/LocalTerminalView.vue
@@ -9,7 +9,7 @@
 </template>
 
 <script setup lang="ts">
-import { ref, onMounted, watch } from "vue";
+import { ref, onMounted, onBeforeUnmount, watch } from "vue";
 import { invoke } from "@tauri-apps/api/core";
 import { useTerminal } from "@/composables/useTerminal";
 import "@/assets/css/terminal.css";
@@ -20,11 +20,20 @@ const props = defineProps<{
 }>();
 
 const containerRef = ref<HTMLElement | null>(null);
-const { terminal, mount, fit } = useTerminal(props.sessionId, "pty");
+const { terminal, mount, fit, destroy } = useTerminal(props.sessionId, "pty");
+let resizeObserver: ResizeObserver | null = null;
 
 onMounted(() => {
   if (containerRef.value) {
     mount(containerRef.value);
+
+    // Watch container size changes and refit terminal
+    resizeObserver = new ResizeObserver(() => {
+      if (props.isActive) {
+        fit();
+      }
+    });
+    resizeObserver.observe(containerRef.value);
   }
   setTimeout(() => {
     fit();
@@ -48,4 +57,12 @@ watch(
     }
   },
 );
+
+onBeforeUnmount(() => {
+  if (resizeObserver) {
+    resizeObserver.disconnect();
+    resizeObserver = null;
+  }
+  destroy();
+});
 </script>
diff --git a/src/composables/useTerminal.ts b/src/composables/useTerminal.ts
index bbebdf6..e672fbb 100644
--- a/src/composables/useTerminal.ts
+++ b/src/composables/useTerminal.ts
@@ -70,7 +70,9 @@ export function useTerminal(sessionId: string, backend: 'ssh' | 'pty' = 'ssh'):
     cursorStyle: "block",
     scrollback: 10000,
     allowProposedApi: true,
-    convertEol: backend === 'ssh',
+    // SSH always needs EOL conversion. PTY needs it on Windows (ConPTY sends bare \n)
+    // but not on Unix (PTY driver handles LF→CRLF). navigator.platform is the simplest check.
+    convertEol: backend === 'ssh' || navigator.platform.startsWith('Win'),
     rightClickSelectsWord: false,
   });