diff --git a/src/osd.c b/src/osd.c
index d37261a9..b358b2ae 100644
--- a/src/osd.c
+++ b/src/osd.c
@@ -379,21 +379,19 @@ render_osd(struct server *server, cairo_t *cairo, int w, int h,
 				buf_add(&buf, get_type(*view));
 				break;
 			case LAB_FIELD_WINFO:
-				if (rc.window_switcher.all_workspaces) {
-					buf_add(&buf, (*view)->workspace->name);
-					if ((*view)->maximized) {
-						buf_add(&buf, " M ");
-					} else if ((*view)->minimized) {
-						buf_add(&buf, " m ");
-					} else if ((*view)->fullscreen) {
-						buf_add(&buf, " F ");
-					} else {
-						buf_add(&buf, "   ");
-					}
+				buf_add(&buf, (*view)->workspace->name);
+				if ((*view)->maximized) {
+					buf_add(&buf, " M ");
+				} else if ((*view)->minimized) {
+					buf_add(&buf, " m ");
+				} else if ((*view)->fullscreen) {
+					buf_add(&buf, " F ");
+				} else {
+					buf_add(&buf, "   ");
 				}
 				buf_add(&buf, get_winfo(*view));
-				if (rc.window_switcher.all_workspaces &&
-						wl_list_length(&server->outputs) > 1) {
+				if (wl_list_length(&server->outputs) > 1 && 
+						output_is_usable(*view->output)) {
 					buf_add(&buf, (*view)->output->wlr_output->name);
 				}
 				break;