diff --git a/window/src/os/wayland/seat.rs b/window/src/os/wayland/seat.rs
index 90b322b77..38bd25940 100644
--- a/window/src/os/wayland/seat.rs
+++ b/window/src/os/wayland/seat.rs
@@ -80,7 +80,7 @@ impl SeatHandler for WaylandState {
         match capability {
             Capability::Keyboard => {
                 log::trace!("Lost keyboard capability");
-                self.keyboard.take().unwrap().release();
+                self.keyboard.take().map(|k| k.release());
             }
             Capability::Pointer => {
                 log::trace!("Lost pointer capability");