diff --git a/profile_manager.py b/profile_manager.py
index 10f6599..da00c51 100644
--- a/profile_manager.py
+++ b/profile_manager.py
@@ -65,8 +65,8 @@
 MODEL_LAYOUTS: dict[str, dict[str, tuple[int, int]]] = {
     # Stream Deck (Original)
     "20GBA9901": {KEYPAD: (5, 3)},
-    # Stream Deck + XL (32 keys, 6 dials with 1200x100 touchstrip)
-    "20GBX9901": {KEYPAD: (8, 4), ENCODER: (6, 1)},
+    # Stream Deck + XL (36 keys, 6 dials with 1200x100 touchstrip)
+    "20GBX9901": {KEYPAD: (9, 4), ENCODER: (6, 1)},
     # Emulator used by the Elgato desktop app
     "UI Stream Deck": {KEYPAD: (4, 2)},
 }
diff --git a/tests/test_profile_manager.py b/tests/test_profile_manager.py
index 0d0232b..97d66f8 100644
--- a/tests/test_profile_manager.py
+++ b/tests/test_profile_manager.py
@@ -382,7 +382,7 @@ def test_read_page_requires_locator(sample_profiles_v3: Path, tmp_path: Path) ->
 
 @pytest.fixture
 def sample_profiles_plus_xl(tmp_path: Path) -> Path:
-    """Profile shaped like a Stream Deck + XL: Keypad 8x4 + Encoder 6x1 on the same page."""
+    """Profile shaped like a Stream Deck + XL: Keypad 9x4 + Encoder 6x1 on the same page."""
 
     profiles_dir = tmp_path / "ProfilesV3"
     profile_dir = profiles_dir / "PLUSXL.sdProfile"
@@ -449,9 +449,9 @@ def test_read_page_returns_both_controllers(sample_profiles_plus_xl: Path, tmp_p
 
     page = manager.read_page(profile_name="Plus XL", page_index=0)
 
-    assert page["layout"] == {"columns": 8, "rows": 4}
+    assert page["layout"] == {"columns": 9, "rows": 4}
     assert page["layouts"] == {
-        "keypad": {"columns": 8, "rows": 4},
+        "keypad": {"columns": 9, "rows": 4},
         "encoder": {"columns": 6, "rows": 1},
     }
     controllers = {button["controller"] for button in page["buttons"]}