diff --git a/src/server/event.rs b/src/server/event.rs
index 93403d5..e3f086b 100644
--- a/src/server/event.rs
+++ b/src/server/event.rs
@@ -255,6 +255,9 @@ impl SurfaceData {
                 let activated = states.contains(&(u32::from(xdg_toplevel::State::Activated) as u8));
 
                 if activated {
+                    // Technically this is wrong - activated doesn't necessarily mean focused
+                    // - but it works and no one's complained yet.
+                    // TODO: base focus on keyboard enter instead.
                     state.to_focus = Some(self.window.unwrap());
                 }
 
diff --git a/src/xstate/mod.rs b/src/xstate/mod.rs
index c945738..18004ad 100644
--- a/src/xstate/mod.rs
+++ b/src/xstate/mod.rs
@@ -697,7 +697,6 @@ bitflags! {
 bitflags! {
     /// https://tronche.com/gui/x/icccm/sec-4.html#s-4.1.2.4
     pub struct WmHintsFlags: u32 {
-        const Input = 1;
         const WindowGroup = 64;
     }
 }
@@ -739,7 +738,6 @@ impl From<&[u32]> for WmNormalHints {
 
 #[derive(Default, Debug, PartialEq, Eq)]
 pub struct WmHints {
-    pub input: Option<bool>,
     pub window_group: Option<x::Window>,
 }
 
@@ -748,9 +746,6 @@ impl From<&[u32]> for WmHints {
         let mut ret = Self::default();
         let flags = WmHintsFlags::from_bits_truncate(value[0]);
 
-        if flags.contains(WmHintsFlags::Input) {
-            ret.input = Some(value[1] == 1);
-        }
         if flags.contains(WmHintsFlags::WindowGroup) {
             let window = unsafe { x::Window::new(value[8]) };
             ret.window_group = Some(window);
@@ -817,30 +812,11 @@ impl super::XConnection for Arc<xcb::Connection> {
     }
 
     fn focus_window(&mut self, window: x::Window, atoms: Self::ExtraData) {
-        let prop =
-            unwrap_or_skip_bad_window!(self.wait_for_reply(self.send_request(&x::GetProperty {
-                delete: false,
-                window,
-                property: x::ATOM_WM_HINTS,
-                r#type: x::ATOM_WM_HINTS,
-                long_offset: 0,
-                long_length: 9,
-            })));
-
-        let set_focus = if prop.r#type() == x::ATOM_NONE {
-            true
-        } else {
-            WmHints::from(prop.value()).input.unwrap_or(true)
-        };
-
-        if set_focus {
-            // might fail if window is not visible but who cares
-            let _ = self.send_and_check_request(&x::SetInputFocus {
-                focus: window,
-                revert_to: x::InputFocus::None,
-                time: x::CURRENT_TIME,
-            });
-        }
+        unwrap_or_skip_bad_window!(self.send_and_check_request(&x::SetInputFocus {
+            focus: window,
+            revert_to: x::InputFocus::None,
+            time: x::CURRENT_TIME,
+        }));
 
         unwrap_or_skip_bad_window!(self.send_and_check_request(&x::ChangeProperty {
             mode: x::PropMode::Replace,
diff --git a/tests/integration.rs b/tests/integration.rs
index 8013056..8ebd24e 100644
--- a/tests/integration.rs
+++ b/tests/integration.rs
@@ -482,68 +482,22 @@ fn input_focus() {
     let mut f = Fixture::new();
     let mut connection = Connection::new(&f.display);
 
-    fn tst(
-        f: &mut Fixture,
-        connection: &mut Connection,
-        set_props: impl FnOnce(&mut Connection, x::Window),
-        check: impl FnOnce(/* win: */ x::Window, /* focus: */ x::Window),
-    ) {
-        let win = connection.new_window(connection.root, 0, 0, 20, 20, false);
-        set_props(connection, win);
-        connection.map_window(win);
-        f.wait_and_dispatch();
-        let surface = f
-            .testwl
-            .last_created_surface_id()
-            .expect("No surface created!");
-        f.configure_and_verify_new_toplevel(connection, win, surface);
+    let win = connection.new_window(connection.root, 0, 0, 20, 20, false);
+    connection.map_window(win);
+    f.wait_and_dispatch();
+    let surface = f
+        .testwl
+        .last_created_surface_id()
+        .expect("No surface created!");
+    f.configure_and_verify_new_toplevel(&mut connection, win, surface);
 
-        let focus = connection
-            .wait_for_reply(connection.send_request(&x::GetInputFocus {}))
-            .unwrap()
-            .focus();
-        check(win, focus);
+    let focus = connection
+        .wait_for_reply(connection.send_request(&x::GetInputFocus {}))
+        .unwrap()
+        .focus();
+    assert_eq!(win, focus);
 
-        f.close_toplevel(connection, win, surface);
-    }
-
-    // Input field unset
-    tst(
-        &mut f,
-        &mut connection,
-        |_, _| {},
-        |win, focus| assert_eq!(win, focus),
-    );
-
-    // Input field set to false
-    tst(
-        &mut f,
-        &mut connection,
-        |connection, win| {
-            connection.set_property(
-                win,
-                x::ATOM_WM_HINTS,
-                x::ATOM_WM_HINTS,
-                &[WmHintsFlags::Input.bits(), 0],
-            );
-        },
-        |win, focus| assert_ne!(win, focus),
-    );
-
-    // Input field set to true
-    tst(
-        &mut f,
-        &mut connection,
-        |connection, win| {
-            connection.set_property(
-                win,
-                x::ATOM_WM_HINTS,
-                x::ATOM_WM_HINTS,
-                &[WmHintsFlags::Input.bits(), 1],
-            );
-        },
-        |win, focus| assert_eq!(win, focus),
-    );
+    f.close_toplevel(&mut connection, win, surface);
 }
 
 #[test]
@@ -558,12 +512,6 @@ fn quick_delete() {
         .testwl
         .last_created_surface_id()
         .expect("No surface created");
-    connection.set_property(
-        window,
-        x::ATOM_WM_HINTS,
-        x::ATOM_WM_HINTS,
-        &[WmHintsFlags::Input.bits(), 0],
-    );
     connection.set_property(
         window,
         x::ATOM_STRING,