diff --git a/sway/tree/workspace.c b/sway/tree/workspace.c
index 733a002b4..9a8e53d25 100644
--- a/sway/tree/workspace.c
+++ b/sway/tree/workspace.c
@@ -205,6 +205,9 @@ static bool workspace_valid_on_output(const char *output_name,
 		if (output_match_name_or_id(output, wsc->outputs->items[i])) {
 			return true;
 		}
+		if (output_by_name_or_id(wsc->outputs->items[i])) {
+			return false; // a higher-priority output is available
+		}
 	}
 
 	return false;
@@ -326,6 +329,9 @@ char *workspace_next_name(const char *output_name) {
 				target = strdup(wsc->workspace);
 				break;
 			}
+			if (output_by_name_or_id(wsc->outputs->items[j])) {
+				break; // a higher-priority output is available
+			}
 		}
 		if (found) {
 			break;