diff --git a/src/main.rs b/src/main.rs
index acd87d6..8d0fb5e 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -453,6 +453,7 @@ fn main() {
                         layers.set_row_data(i, item);
                     }
                 }
+                w.global::<KeymapBridge>().set_active_layer(layer_index);
                 w.global::<AppState>().set_status_text(SharedString::from(format!("Loading layer {}...", idx)));
             }
             let serial = serial.clone();
diff --git a/ui/tabs/tab_keymap.slint b/ui/tabs/tab_keymap.slint
index 0ca00cc..ee379db 100644
--- a/ui/tabs/tab_keymap.slint
+++ b/ui/tabs/tab_keymap.slint
@@ -58,6 +58,7 @@ export component TabKeymap inherits VerticalLayout {
             if root.renaming : VerticalLayout {
                 spacing: 4px;
                 rename-input := DarkLineEdit {
+                    max-width: 85px;
                     placeholder-text: "New name";
                     accepted(text) => {
                         KeymapBridge.rename-layer(KeymapBridge.active-layer, text);