diff --git a/src/core/button.rs b/src/core/button.rs
index b76889c..fcf4361 100644
--- a/src/core/button.rs
+++ b/src/core/button.rs
@@ -169,8 +169,8 @@ impl<D: Display, K: Keyboard> Button<D, K> {
                mut layout: Layout, mut kbd: K,
                gfx: Arc<Mutex<Graphics<D>>>) -> Button<D, K>
     {
-        kbd.change_layout(&layout);
         layout.update_keys_supported(&kbd);
+        kbd.change_layout(&layout);
 
         Button {
             layout,
diff --git a/src/wayland/keyboard.rs b/src/wayland/keyboard.rs
index 228c4b4..d9b8254 100644
--- a/src/wayland/keyboard.rs
+++ b/src/wayland/keyboard.rs
@@ -225,7 +225,7 @@ impl Keyboard for VirtualKeyboard {
         for row in layout.rows() {
             for key in row {
                 for part in &key.parts {
-                    if part.sym() == Keysym::NoSymbol || part.sym() == Keysym::XF86_Fn {
+                    if !part.key_available() {
                         continue;
                     }