diff --git a/src/ZenWorkspaces.mjs b/src/ZenWorkspaces.mjs
index 79e8e4a..bfa92ec 100644
--- a/src/ZenWorkspaces.mjs
+++ b/src/ZenWorkspaces.mjs
@@ -786,15 +786,8 @@ var ZenWorkspaces = {
     let activeWorkspace = workspaces.workspaces.find((workspace) => workspace.used);
     let workspaceIndex = workspaces.workspaces.indexOf(activeWorkspace);
     // note: offset can be negative
-    if (workspaceIndex + offset >= workspaces.workspaces.length) {
-      workspaceIndex = 0;
-    } else if (workspaceIndex + offset < 0) {
-      workspaceIndex = workspaces.workspaces.length - 1;
-    } else {
-      workspaceIndex += offset;
-    }
-    let nextWorkspace = workspaces.workspaces[workspaceIndex];
-    this.changeWorkspace(nextWorkspace);
+    let nextWorkspace = workspaces.workspaces[(workspaceIndex + offset + workspaces.workspaces.length) % workspaces.workspaces.length];
+    await this.changeWorkspace(nextWorkspace);
   },
 
   _initializeWorkspaceTabContextMenus() {