diff --git a/src/core/button.rs b/src/core/button.rs
index 3dc6403..85117aa 100644
--- a/src/core/button.rs
+++ b/src/core/button.rs
@@ -160,10 +160,11 @@ const ANGLE_PARTS: [[usize; 4]; 16] = [
 const NO_PRESS: Option<Press> = None;
 
 impl<D: Display, K: Keyboard> Button<D, K> {
-    pub fn new(layout: Layout, mut kbd: K,
+    pub fn new(mut layout: Layout, mut kbd: K,
                gfx: Arc<Mutex<Graphics<D>>>) -> Button<D, K>
     {
         kbd.change_layout(&layout);
+        layout.update_keys_supported(&kbd);
 
         Button {
             layout,