diff --git a/modules/Commands.qml b/modules/Commands.qml
index f2210cf..cdf3aee 100644
--- a/modules/Commands.qml
+++ b/modules/Commands.qml
@@ -54,6 +54,8 @@ Scope {
         if (index > uiState.workspaces.count) return;
         let id;
         if (index === uiState.workspaces.count) {
+            if (uiState.workspaces.get(index - 1).workspace === Hypr.focusedWorkspace
+                && Hypr.focusedWorkspace.toplevels.values.length === 0) return;
             id = root.nextWorkspace();
         } else {
             id = uiState.workspaces.get(index).workspace.id;
@@ -77,6 +79,8 @@ Scope {
         if (index > uiState.workspaces.count) return;
         let id;
         if (index === uiState.workspaces.count) {
+            if (uiState.workspaces.get(index - 1).workspace === Hypr.focusedWorkspace
+                && Hypr.focusedWorkspace.toplevels.values.length === 0) return;
             id = nextWorkspace();
         } else {
             id = uiState.workspaces.get(index).workspace.id;