diff --git a/cosmic-settings/src/pages/input/keyboard/mod.rs b/cosmic-settings/src/pages/input/keyboard/mod.rs
index f072dae..bc7142e 100644
--- a/cosmic-settings/src/pages/input/keyboard/mod.rs
+++ b/cosmic-settings/src/pages/input/keyboard/mod.rs
@@ -215,6 +215,7 @@ fn popover_button(id: DefaultKey, expanded: bool) -> cosmic::Element<'static, Me
     if expanded {
         cosmic::widget::popover(button)
             .popup(popover_menu(id))
+            .on_close(Message::ExpandInputSourcePopover(None))
             .into()
     } else {
         button.into()