diff --git a/justfile b/justfile
index 26f6b8ed..d0a3ee43 100644
--- a/justfile
+++ b/justfile
@@ -18,8 +18,13 @@ lint:
 ci filter='all()': lint
     cargo nextest run --locked -E "{{filter}}" --status-level fail --final-status-level slow --failure-output final --success-output never
 
-# Check formatting + run unit tests + maintenance script tests
-check: ci
+# Run Windows target lint from Unix/macOS to catch cfg(windows) compile and clippy failures before CI
+windows-lint:
+    rustup target add x86_64-pc-windows-msvc
+    LIBGHOSTTY_VT_SIMD=false cargo clippy --bin herdr --locked --target x86_64-pc-windows-msvc -- -D warnings
+
+# Check formatting + run unit tests + Windows target lint + maintenance script tests
+check: ci windows-lint
     python3 -m unittest scripts.test_agent_detection_manifest_check scripts.test_changelog scripts.test_preview scripts.test_vendor_libghostty_vt
     @echo "docs reminder: if this changes user-facing behavior, make sure the relevant release docs are updated or called out before release."
 
diff --git a/src/raw_input.rs b/src/raw_input.rs
index 9978cc0c..5638cd7a 100644
--- a/src/raw_input.rs
+++ b/src/raw_input.rs
@@ -380,6 +380,7 @@ pub(crate) fn events_require_host_surface_redraw(
             .any(|event| matches!(event, RawInputEvent::OuterFocusGained))
 }
 
+#[cfg(any(not(windows), test))]
 pub(crate) fn events_require_host_terminal_theme_query(events: &[RawInputEvent]) -> bool {
     events
         .iter()