From f53d49e0ff043c74d3ba46d63511fcd3a67d9248 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Michelle?= <andre.michelle@gmail.com>
Date: Mon, 11 Aug 2025 10:06:57 +0200
Subject: [PATCH] fixes tab cycling

---
 packages/app/studio/src/service/Shortcuts.ts | 3 ++-
 packages/studio/core/src/dawproject/todo.md  | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/app/studio/src/service/Shortcuts.ts b/packages/app/studio/src/service/Shortcuts.ts
index e181702b..ce1f3427 100644
--- a/packages/app/studio/src/service/Shortcuts.ts
+++ b/packages/app/studio/src/service/Shortcuts.ts
@@ -36,12 +36,13 @@ export class Shortcuts {
             } else if (code === "KeyM") {
                 service.panelLayout.getByType(PanelType.Mixer).toggleMinimize()
             } else if (code === "Tab") {
+                event.preventDefault()
                 const keys = Object.entries(DefaultWorkspace)
                     .filter((entry: [string, Workspace.Screen]) => !entry[1].hidden)
                     .map(([key]) => key as Workspace.ScreenKeys)
                 const screen = service.layout.screen
                 const current = screen.getValue()
-                if (isUndefined(current)) {return}
+                if (isUndefined(current) || !keys.includes(current)) {return}
                 if (event.shiftKey) {
                     screen.setValue(Arrays.getPrev(keys, current))
                 } else {
diff --git a/packages/studio/core/src/dawproject/todo.md b/packages/studio/core/src/dawproject/todo.md
index 81696c21..5fc4ec4f 100644
--- a/packages/studio/core/src/dawproject/todo.md
+++ b/packages/studio/core/src/dawproject/todo.md
@@ -20,7 +20,7 @@
 
 ### Importer
 
-* Map to new uuids (not when exporting)
+* ~~Map to new uuids (not when exporting)~~
 * ~~Create the openDAW device if found~~
       * ~~Read preset~~
 * Create automation