diff --git a/src/main.c b/src/main.c
index 31f2b1e2..6f8c6bd2 100644
--- a/src/main.c
+++ b/src/main.c
@@ -549,6 +549,8 @@ remove_displays_and_keyboard (state_t *state)
       node = next_node;
     }
 
+  ply_keyboard_stop_watching_for_input (state->keyboard);
+  ply_keyboard_free (state->keyboard);
   state->keyboard = NULL;
 }